diff options
| author | Steve Baker <sbaker@redhat.com> | 2013-02-28 10:40:04 +1300 |
|---|---|---|
| committer | Steve Baker <sbaker@redhat.com> | 2013-02-28 14:02:17 +1300 |
| commit | 4dc88ac6abad1876381d30609c88d17daff1cccf (patch) | |
| tree | 4bf0acf0aabb994538b085b3b95df8ec14120059 /heat_cfntools/cfntools | |
| parent | 535ac664a518529a2be7ca21500f8145f25cebad (diff) | |
| download | heat-cfntools-4dc88ac6abad1876381d30609c88d17daff1cccf.tar.gz | |
Look for heat data files in /var/lib/heat-cfntools
The /var/lib/heat-cfntools directory should be owned by the
heat-cfntools package for whichever distro it is included.
This avoids the problem of heat writing to directories owned
by cloud-init.
This is the guest-side change which corresponds to this review
https://review.openstack.org/#/c/23052/
Fixes: Bug #1105806
Diffstat (limited to 'heat_cfntools/cfntools')
| -rw-r--r-- | heat_cfntools/cfntools/cfn_helper.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/heat_cfntools/cfntools/cfn_helper.py b/heat_cfntools/cfntools/cfn_helper.py index a306ce9..8dcabf3 100644 --- a/heat_cfntools/cfntools/cfn_helper.py +++ b/heat_cfntools/cfntools/cfn_helper.py @@ -42,7 +42,7 @@ from urlparse import urlparse, urlunparse # Override BOTO_CONFIG, which makes boto look only at the specified # config file, instead of the default locations -os.environ['BOTO_CONFIG'] = '/var/lib/cloud/data/cfn-boto-cfg' +os.environ['BOTO_CONFIG'] = '/var/lib/heat-cfntools/cfn-boto-cfg' from boto.cloudformation import CloudFormationConnection @@ -816,7 +816,7 @@ class ConfigsetsHandler(object): return executionlist -def metadata_server_port(datafile='/var/lib/cloud/data/cfn-metadata-server'): +def metadata_server_port(datafile='/var/lib/heat-cfntools/cfn-metadata-server'): """ Return the the metadata server port reads the :NNNN from the end of the URL in cfn-metadata-server @@ -1074,7 +1074,7 @@ class Metadata(object): def retrieve(self, meta_str=None, - default_path='/var/lib/cloud/data/cfn-init-data', + default_path='/var/lib/heat-cfntools/cfn-init-data', last_path='/tmp/last_metadata'): """ Read the metadata from the given filename @@ -1090,7 +1090,7 @@ class Metadata(object): # If reading remote metadata fails, we fall-back on local files # in order to get the most up-to-date version, we try: # /tmp/last_metadata, followed by - # /var/lib/cloud/data/cfn-init-data + # /var/lib/heat-cfntools/cfn-init-data # This should allow us to do the right thing both during the # first cfn-init run (when we only have cfn-init-data), and # in the event of a temporary interruption to connectivity |