| author | Drew Fisher <drew.fisher@oracle.com> |
| Fri, 14 Oct 2016 08:02:40 -0700 | |
| branch | s11u3-sru |
| changeset 7131 | 91c8a4919493 |
| permissions | -rw-r--r-- |
|
7131
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to change the default for the heat_config_dir to |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
something less Windows-oriented. Upstream bug |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
https://bugs.launchpad.net/cloudbase-init/+bug/1633235 has been filed |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
to track this effort. |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
|
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
6 |
--- cloudbase-init-0.9.9/cloudbaseinit/plugins/common/userdataplugins/heat.py.orig 2016-05-23 06:48:28.287743238 -0700 |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
+++ cloudbase-init-0.9.9/cloudbaseinit/plugins/common/userdataplugins/heat.py 2016-05-23 06:52:54.574788709 -0700 |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
@@ -24,8 +24,9 @@ from cloudbaseinit.utils import encoding |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
|
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
|
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
opts = [ |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
- cfg.StrOpt('heat_config_dir', default='C:\\cfn', help='The directory '
|
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
- 'where the Heat configuration files must be saved'), |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
+ cfg.StrOpt('heat_config_dir', default='/system/volatile',
|
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
+ help='The directory where the Heat configuration files must ' |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
+ 'be saved'), |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
] |
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
|
|
91c8a4919493
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
CONF = cfg.CONF |