| author | Drew Fisher <drew.fisher@oracle.com> |
| Tue, 23 Sep 2014 09:05:19 -0700 | |
| branch | s11-update |
| changeset 3320 | f9d413d0e202 |
| child 3998 | 5bd484384122 |
| permissions | -rw-r--r-- |
|
3320
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to remove /usr/lib64/heat from the default list of |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
plugin directories searched by Heat. This patch is Solaris specific |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
and not suitable for upstream contribution. |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
|
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
--- heat-2013.2.3/heat/common/config.py.orig 2014-07-17 12:48:08.249427463 -0600 |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
6 |
+++ heat-2013.2.3/heat/common/config.py 2014-07-17 12:48:31.499385628 -0600 |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
@@ -85,7 +85,7 @@ |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
default='heat.engine.nova', |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
help='Driver to use for controlling instances'), |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
cfg.ListOpt('plugin_dirs',
|
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
- default=['/usr/lib64/heat', '/usr/lib/heat'], |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
+ default=['/usr/lib/heat'], |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
help='List of directories to search for Plugins'), |
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
cfg.StrOpt('environment_dir',
|
|
f9d413d0e202
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
default='/etc/heat/environment.d', |