summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZane Bitter <zbitter@redhat.com>2019-05-29 14:25:21 -0400
committerPavlo Shchelokovskyy <pshchelokovskyy@mirantis.com>2019-05-31 07:40:42 +0000
commit89c1cc473211189cf490a1038cb371ab3359dd89 (patch)
tree0dc0b0315960152c9d5aa78b4e5ca2f8e3a813d5
parent75dab33e7dc4af773ea7b742d35a5075d45b1ac7 (diff)
downloadheat-89c1cc473211189cf490a1038cb371ab3359dd89.tar.gz
Fix regression with SW deployments when region not configured
The region name eventually has to pass through an os-collect-config.conf file, the format of which is unable to distinguish between the JSON null (equivalent to None in Python) and the string "null". This means that Story 2002781 caused a regression for users who didn't have the region_name_for_services config option explicitly set in heat.conf. To avoid this, only specify the region when we know what it is. Change-Id: I23493b1c477d082c478f87167de2c1859ba5ace7 Story: #2005797 Task: 33527 Task: 33528 (cherry picked from commit d580565abff2997002eff856535bdfd2ddb44da7)
-rw-r--r--heat/engine/resources/openstack/heat/software_deployment.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/heat/engine/resources/openstack/heat/software_deployment.py b/heat/engine/resources/openstack/heat/software_deployment.py
index ba428eb95..44b4a9db2 100644
--- a/heat/engine/resources/openstack/heat/software_deployment.py
+++ b/heat/engine/resources/openstack/heat/software_deployment.py
@@ -416,9 +416,11 @@ class SoftwareDeployment(signal_responder.SignalResponder):
yield swc_io.InputConfig(
name=self.DEPLOY_PROJECT_ID, value=creds['project_id'],
description=_('ID of project for API authentication'))
- yield swc_io.InputConfig(
- name=self.DEPLOY_REGION_NAME, value=creds['region_name'],
- description=_('Region name for API authentication'))
+ if creds['region_name']:
+ yield swc_io.InputConfig(
+ name=self.DEPLOY_REGION_NAME,
+ value=creds['region_name'],
+ description=_('Region name for API authentication'))
if self._signal_transport_zaqar():
yield swc_io.InputConfig(
name=self.DEPLOY_QUEUE_ID,