diff --git a/magnum/drivers/common/image/heat-container-agent/scripts/heat-config-notify b/magnum/drivers/common/image/heat-container-agent/scripts/heat-config-notify index eba1258644..f479519bc4 100755 --- a/magnum/drivers/common/image/heat-container-agent/scripts/heat-config-notify +++ b/magnum/drivers/common/image/heat-container-agent/scripts/heat-config-notify @@ -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) diff --git a/magnum/drivers/common/image/heat-container-agent/scripts/write-os-apply-config-templates.sh b/magnum/drivers/common/image/heat-container-agent/scripts/write-os-apply-config-templates.sh index 15b3aa57db..750f580bd4 100644 --- a/magnum/drivers/common/image/heat-container-agent/scripts/write-os-apply-config-templates.sh +++ b/magnum/drivers/common/image/heat-container-agent/scripts/write-os-apply-config-templates.sh @@ -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}}