author | Devjani Ray <devjani.ray@oracle.com> |
Fri, 20 May 2016 17:42:29 -0400 | |
branch | s11u3-sru |
changeset 6035 | c9748fcc32de |
parent 4072 | db0cec748ec0 |
child 6850 | f8d3bc724af7 |
permissions | -rw-r--r-- |
6035
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
1 |
In-house patch to remove /usr/lib64/heat, /usr/local/lib/heat, and |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
2 |
/usr/local/lib64/heat from the default list of plugin directories |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
3 |
searched by Heat. This patch is Solaris specific and not suitable for |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
4 |
upstream contribution. |
3320
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
|
6035
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
6 |
--- heat-2015.1.2/heat/common/config.py.~1~ 2015-10-13 09:51:53.000000000 -0700 |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
7 |
+++ heat-2015.1.2/heat/common/config.py 2016-01-28 01:27:19.707862313 -0800 |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
8 |
@@ -97,8 +97,7 @@ engine_opts = [ |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
9 |
"with your cloud image (for OS::Nova::Server) or " |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
10 |
"'ec2-user' (for AWS::EC2::Instance).")), |
3320
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
cfg.ListOpt('plugin_dirs', |
6035
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
12 |
- default=['/usr/lib64/heat', '/usr/lib/heat', |
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
13 |
- '/usr/local/lib/heat', '/usr/local/lib64/heat'], |
3320
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
+ default=['/usr/lib/heat'], |
6035
c9748fcc32de
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
4072
diff
changeset
|
15 |
help=_('List of directories to search for plug-ins.')), |
3320
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
cfg.StrOpt('environment_dir', |
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
default='/etc/heat/environment.d', |