author | Drew Fisher <drew.fisher@oracle.com> |
Thu, 13 Oct 2016 12:49:00 -0700 | |
changeset 7108 | e30b3b76a5ab |
permissions | -rw-r--r-- |
7108
e30b3b76a5ab
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 |
e30b3b76a5ab
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
something less Windows-oriented. Upstream bug |
e30b3b76a5ab
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 |
e30b3b76a5ab
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
to track this effort. |
e30b3b76a5ab
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
|
e30b3b76a5ab
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 |
e30b3b76a5ab
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 |
e30b3b76a5ab
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 |
e30b3b76a5ab
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
|
e30b3b76a5ab
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
|
e30b3b76a5ab
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
opts = [ |
e30b3b76a5ab
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 ' |
e30b3b76a5ab
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'), |
e30b3b76a5ab
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', |
e30b3b76a5ab
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 ' |
e30b3b76a5ab
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
+ 'be saved'), |
e30b3b76a5ab
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
] |
e30b3b76a5ab
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
|
e30b3b76a5ab
23329921 cloudbase-init creates C:\\cfn on Solaris
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
CONF = cfg.CONF |