openstack/tripleo-common
Code Issues Proposed changes

Merge "Defaults to parent_resource name correctly"

Browse Source
This commit is contained in:
Zuul
2018-03-20 08:16:25 +00:00
committed by Gerrit Code Review
parent 1937efd226 204947c908
commit 42ac2d7632
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_common/utils/config.py
View File

@@ -217,10 +217,10 @@ class Config(object):
config_dict = self.get_config_dict(deployment)
# deployment_name should be set via the name property on the
# Deployment resources in the templates, however, if it's None,
# default to the name of the parent_resource
# Deployment resources in the templates, however, if it's None
# or empty string, default to the name of the parent_resource.
deployment_name = deployment.attributes['value'].get(
'name', deployment.parent_resource)
'name') or deployment.parent_resource
config_dict['deployment_name'] = deployment_name
# reset deploy_server_id to the actual server_id since we have to