openstack/tripleo-common
Code Issues Proposed changes

Remove references to overcloud-without-mergepy

Browse Source 
The file overcloud-without-mergepy is no longer used.
This was replaced by the overcloud.yaml file.

Change-Id: If5709e3f44925546751a237ccc492fa488d3bd82
closes-bug: #1623978
This commit is contained in:
Ryan Hallisey 2016-09-23 14:46:52 +00:00
parent 6b83c8cb10
commit 63ab6f1b9d
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleo_common/constants.py
View File

@ -15,7 +15,6 @@
#: The names of the root template in a standard tripleo-heat-template layout. #: The names of the root template in a standard tripleo-heat-template layout.
TEMPLATE_NAME = 'overcloud-without-mergepy.yaml'
OVERCLOUD_YAML_NAME = "overcloud.yaml" OVERCLOUD_YAML_NAME = "overcloud.yaml"
#: The name of the overcloud root template in jinja2 format. #: The name of the overcloud root template in jinja2 format.

3
tripleo_common/scale.py
View File

@ -96,7 +96,8 @@ class ScaleManager(object):
timeout_mins=constants.STACK_TIMEOUT_DEFAULT): timeout_mins=constants.STACK_TIMEOUT_DEFAULT):
tpl_files, template = template_utils.get_template_contents( tpl_files, template = template_utils.get_template_contents(
template_file=os.path.join(self.tht_dir, constants.TEMPLATE_NAME)) template_file=os.path.join(self.tht_dir,
constants.OVERCLOUD_YAML_NAME))
env_paths = [] env_paths = []
if self.environment_files: if self.environment_files:

3
tripleo_common/update.py
View File

@ -52,7 +52,8 @@ class PackageUpdateManager(_stack_update.StackUpdateManager):
stack_params = {'UpdateIdentifier': timestamp, 'StackAction': 'UPDATE'} stack_params = {'UpdateIdentifier': timestamp, 'StackAction': 'UPDATE'}
tpl_files, template = template_utils.get_template_contents( tpl_files, template = template_utils.get_template_contents(
template_file=os.path.join(self.tht_dir, constants.TEMPLATE_NAME)) template_file=os.path.join(self.tht_dir,
constants.OVERCLOUD_YAML_NAME))
env_paths = [] env_paths = []
if self.environment_files: if self.environment_files:
env_paths.extend(self.environment_files) env_paths.extend(self.environment_files)