openstack
/
openstacksdk
Code Issues Proposed changes

Merge "Do not disregard tags when updating stacks"

This commit is contained in:
Zuul 2019-03-28 11:49:08 +00:00 committed by Gerrit Code Review
parent 96e513e2f5 a0ec8ef7fd
commit b33079bc9c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack/cloud/_orchestration.py
View File

@ -110,7 +110,7 @@ class OrchestrationCloudMixin(_normalize.Normalizer):
self, name_or_id,
template_file=None, template_url=None,
template_object=None, files=None,
rollback=True,
rollback=True, tags=None,
wait=False, timeout=3600,
environment_files=None,
**parameters):
@ -146,6 +146,7 @@ class OrchestrationCloudMixin(_normalize.Normalizer):
files=files)
params = dict(
disable_rollback=not rollback,
tags=tags,
parameters=parameters,
template=template,
files=dict(list(tpl_files.items()) + list(envfiles.items())),

4
openstack/tests/unit/cloud/test_stack.py
View File

@ -425,6 +425,7 @@ class TestStack(base.TestCase):
'environment': {},
'files': {},
'parameters': {},
'tags': self.stack_tag,
'template': fakes.FAKE_TEMPLATE_CONTENT,
'timeout_mins': 60})),
dict(
@ -446,6 +447,7 @@ class TestStack(base.TestCase):
])
self.cloud.update_stack(
self.stack_name,
tags=self.stack_tag,
template_file=test_template.name)
self.assert_calls()
@ -479,6 +481,7 @@ class TestStack(base.TestCase):
'environment': {},
'files': {},
'parameters': {},
'tags': self.stack_tag,
'template': fakes.FAKE_TEMPLATE_CONTENT,
'timeout_mins': 60})),
dict(
@ -512,6 +515,7 @@ class TestStack(base.TestCase):
])
self.cloud.update_stack(
self.stack_name,
tags=self.stack_tag,
template_file=test_template.name,
wait=True)