From 63ab6f1b9db1ed3da7c8aba9b0ad4dc31b9d59ef Mon Sep 17 00:00:00 2001 From: Ryan Hallisey Date: Fri, 23 Sep 2016 14:46:52 +0000 Subject: [PATCH] Remove references to overcloud-without-mergepy The file overcloud-without-mergepy is no longer used. This was replaced by the overcloud.yaml file. Change-Id: If5709e3f44925546751a237ccc492fa488d3bd82 closes-bug: #1623978 --- tripleo_common/constants.py | 1 - tripleo_common/scale.py | 3 ++- tripleo_common/update.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tripleo_common/constants.py b/tripleo_common/constants.py index 691c2490f..a35697227 100644 --- a/tripleo_common/constants.py +++ b/tripleo_common/constants.py @@ -15,7 +15,6 @@ #: The names of the root template in a standard tripleo-heat-template layout. -TEMPLATE_NAME = 'overcloud-without-mergepy.yaml' OVERCLOUD_YAML_NAME = "overcloud.yaml" #: The name of the overcloud root template in jinja2 format. diff --git a/tripleo_common/scale.py b/tripleo_common/scale.py index 27abb7146..74c5ea6a6 100644 --- a/tripleo_common/scale.py +++ b/tripleo_common/scale.py @@ -96,7 +96,8 @@ class ScaleManager(object): timeout_mins=constants.STACK_TIMEOUT_DEFAULT): 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 = [] if self.environment_files: diff --git a/tripleo_common/update.py b/tripleo_common/update.py index 9c85b2471..9bca878bd 100644 --- a/tripleo_common/update.py +++ b/tripleo_common/update.py @@ -52,7 +52,8 @@ class PackageUpdateManager(_stack_update.StackUpdateManager): stack_params = {'UpdateIdentifier': timestamp, 'StackAction': 'UPDATE'} 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 = [] if self.environment_files: env_paths.extend(self.environment_files)