openstack/heat
Code Issues Proposed changes

Merge "Avoid cloudwatch endpoint retrieve when disabled"

Browse Source
This commit is contained in:
Jenkins 2017-10-09 07:41:05 +00:00 committed by Gerrit Code Review
commit 50379b7f08
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/clients/os/nova.py
View File

@ -393,14 +393,15 @@ echo -e '%s\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
attachments.append((jsonutils.dumps(metadata), attachments.append((jsonutils.dumps(metadata),
'cfn-init-data', 'x-cfninitdata')) 'cfn-init-data', 'x-cfninitdata'))
if is_cfntools:
heat_client_plugin = self.context.clients.client_plugin('heat') heat_client_plugin = self.context.clients.client_plugin('heat')
watch_url = cfg.CONF.heat_watch_server_url watch_url = cfg.CONF.heat_watch_server_url
if not watch_url: if not watch_url:
watch_url = heat_client_plugin.get_watch_server_url() watch_url = heat_client_plugin.get_watch_server_url()
attachments.append((watch_url, 'cfn-watch-server', 'x-cfninitdata')) attachments.append((watch_url,
'cfn-watch-server', 'x-cfninitdata'))
if is_cfntools:
cfn_md_url = heat_client_plugin.get_cfn_metadata_server_url() cfn_md_url = heat_client_plugin.get_cfn_metadata_server_url()
attachments.append((cfn_md_url, attachments.append((cfn_md_url,
'cfn-metadata-server', 'x-cfninitdata')) 'cfn-metadata-server', 'x-cfninitdata'))