openstack
/
tripleo-common
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2020-02-07 23:42:21 +00:00 committed by Gerrit Code Review
parent cb7c87122e 152b42c46c
commit c99ed78db0
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleo_common/constants.py
View File

@ -211,4 +211,6 @@ MISTRAL_WORK_DIR = '/var/lib/mistral'
EXCLUSIVE_NEUTRON_DRIVERS = ['ovn', 'openvswitch'] EXCLUSIVE_NEUTRON_DRIVERS = ['ovn', 'openvswitch']
UPGRADE_STEPS_MAX = 6 DEFAULT_STEPS_MAX = 6
PER_STEP_TASKS = ['upgrade_tasks']

2
tripleo_common/tests/utils/test_config.py
View File

@ -163,7 +163,7 @@ class TestConfig(base.TestCase):
for role in fake_role: for role in fake_role:
filedir = os.path.join(self.tmp_dir, role) filedir = os.path.join(self.tmp_dir, role)
os.makedirs(filedir) os.makedirs(filedir)
for step in range(constants.UPGRADE_STEPS_MAX): for step in range(constants.DEFAULT_STEPS_MAX):
filepath = os.path.join(filedir, "upgrade_tasks_step%s.yaml" filepath = os.path.join(filedir, "upgrade_tasks_step%s.yaml"
% step) % step)
playbook_tasks = self.config._write_tasks_per_step( playbook_tasks = self.config._write_tasks_per_step(

13
tripleo_common/utils/config.py
View File

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