openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Convert step to integer in when statement for upgrade tasks" into stable/pike

This commit is contained in:
Jenkins 2017-09-08 00:56:39 +00:00 committed by Gerrit Code Review
parent 8706d23cff b1a22aeaa8
commit 968a4da05e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleoclient/tests/v1/overcloud_config/test_overcloud_config.py
View File

@ -145,18 +145,18 @@ class TestOvercloudConfig(utils.TestCommand):
'service': 'name=fake '
'state=stopped',
'tags': 'step1',
'when': 'step == 1'}],
'when': 'step|int == 1'}],
'FakeCompute': [{'name': 'Stop fake service',
'service': 'name=fake state=stopped',
'tags': 'step1',
'when': 'step == 1'},
'when': 'step|int == 1'},
{'name': 'Stop nova-'
'compute service',
'service':
'name=openstack-nova-'
'compute state=stopped',
'tags': 'step1',
'when': 'step == 1'}]
'when': 'step|int == 1'}]
}
mock_get_role_data.return_value = fake_role

5
tripleoclient/v1/overcloud_config.py
View File

@ -71,9 +71,10 @@ class DownloadConfig(command.Command):
when_exists = re.search('step.* == [0-9]', whenline)
if when_exists: # skip if there is an existing 'step == N'
continue
task['when'] = "(%s) and (step == %s)" % (whenline, step)
task['when'] = "(%s) and (step|int == %s)" % (whenline,
step)
else:
task.update({"when": "step == %s" % step})
task.update({"when": "step|int == %s" % step})
def _write_playbook_get_tasks(self, tasks, role, filepath):
playbook = []