openstack
/
tripleo-common
Code Issues Proposed changes

Merge "config: refactor how per step tasks are generated" into stable/train

This commit is contained in:
Zuul 2019-12-23 21:05:04 +00:00 committed by Gerrit Code Review
parent e5dc592601 ccfa1ad194
commit 47ccb43b4c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleo_common/constants.py
View File

@ -212,7 +212,9 @@ MISTRAL_WORK_DIR = '/var/lib/mistral'
EXCLUSIVE_NEUTRON_DRIVERS = ['ovn', 'openvswitch']
UPGRADE_STEPS_MAX = 6
DEFAULT_STEPS_MAX = 6
PER_STEP_TASKS = ['upgrade_tasks']
# Global Directories for clouds.yaml
GLOBAL_OS_DIR = '/etc/openstack'

13
tripleo_common/utils/config.py
View File

@ -251,15 +251,18 @@ class Config(object):
role_group_vars[role_name] = {}
role_group_vars[role_name].update(role[config])
else:
# NOTE(jfrancoa): Move this upgrade_tasks condition to the
# upper level once THT is adapted. We include it here to
# allow the CI to pass until THT changed is not merged.
if config == 'upgrade_tasks':
for i in range(constants.UPGRADE_STEPS_MAX):
# NOTE(emilien): Move this condition to the
# upper level once THT is adapted for all tasks to be
# run per step.
# We include it here to allow the CI to pass until THT
# changed is not merged.
if config in constants.PER_STEP_TASKS:
for i in range(constants.DEFAULT_STEPS_MAX):
filepath = os.path.join(role_path, '%s_step%s.yaml'
% (config, i))
self._write_tasks_per_step(role[config], role_name,
filepath, i)
try:
data = role[config]
except KeyError as e: