openstack
/
magnum
Code Issues Proposed changes

Merge "Pass in `region_name` to get correct heat endpoint" into stable/queens

This commit is contained in:
Zuul 2018-10-25 22:35:27 +00:00 committed by Gerrit Code Review
parent 513cc541f1 62b0f2236f
commit f3465bb92b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
magnum/drivers/common/image/heat-container-agent/scripts/heat-config-notify
View File

@ -123,7 +123,8 @@ def main(argv=sys.argv, stdin=sys.stdin):
password=iv['deploy_password'],
project_id=iv['deploy_project_id'])
endpoint = ks.service_catalog.url_for(
service_type='messaging', endpoint_type='publicURL')
service_type='messaging', endpoint_type='publicURL',
region_name=iv.get('deploy_region_name')
conf = {
'auth_opts': {
@ -146,7 +147,8 @@ def main(argv=sys.argv, stdin=sys.stdin):
password=iv['deploy_password'],
project_id=iv['deploy_project_id'])
endpoint = ks.service_catalog.url_for(
service_type='orchestration', endpoint_type='publicURL')
service_type='orchestration', endpoint_type='publicURL',
region_name=iv.get('deploy_region_name'))
log.debug('Signalling to %s' % endpoint)
heat = heatclient.Client(
'1', endpoint, token=ks.auth_token)

2
magnum/drivers/common/image/heat-container-agent/scripts/write-os-apply-config-templates.sh
View File

@ -45,6 +45,7 @@ password = {{password}}
project_id = {{project_id}}
stack_id = {{stack_id}}
resource_name = {{resource_name}}
region_name = {{region_name}}
{{/heat}}
{{#zaqar}}
@ -54,6 +55,7 @@ user_id = {{user_id}}
password = {{password}}
project_id = {{project_id}}
queue_id = {{queue_id}}
region_name = {{region_name}}
{{/zaqar}}
{{#request}}