| author | Laszlo Peter <laszlo.peter@oracle.com> |
| Wed, 07 Sep 2016 14:48:41 -0700 | |
| changeset 6850 | f8d3bc724af7 |
| parent 5405 | 66fd59fecd68 |
| permissions | -rw-r--r-- |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
1 |
In-house patch to remove /usr/lib64/heat, /usr/local/lib/heat, and |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
2 |
/usr/local/lib64/heat from the default list of plugin directories |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
3 |
searched by Heat. This patch is Solaris specific and not suitable for |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
4 |
upstream contribution. |
|
2025
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
|
|
6850
f8d3bc724af7
24465652 Update Heat for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
6 |
--- heat-6.0.0/heat/common/config.py.~1~ 2016-04-07 00:37:15.000000000 -0700 |
|
f8d3bc724af7
24465652 Update Heat for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
7 |
+++ heat-6.0.0/heat/common/config.py 2016-06-10 14:59:42.624070450 -0700 |
|
f8d3bc724af7
24465652 Update Heat for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
8 |
@@ -88,8 +88,7 @@ service_opts = [ |
|
f8d3bc724af7
24465652 Update Heat for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
9 |
|
|
f8d3bc724af7
24465652 Update Heat for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
5405
diff
changeset
|
10 |
engine_opts = [ |
|
2025
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
cfg.ListOpt('plugin_dirs',
|
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
12 |
- default=['/usr/lib64/heat', '/usr/lib/heat', |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
13 |
- '/usr/local/lib/heat', '/usr/local/lib64/heat'], |
|
2025
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
+ default=['/usr/lib/heat'], |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
15 |
help=_('List of directories to search for plug-ins.')),
|
|
2025
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
cfg.StrOpt('environment_dir',
|
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
default='/etc/heat/environment.d', |