Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Apply tags conditionally so that the module does not throw up an erro… #56710

Merged
merged 2 commits into from May 28, 2019
Merged

Apply tags conditionally so that the module does not throw up an erro… #56710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f900520
Apply tags conditionally so that the module does not throw up an erro…
brtkwr May 17, 2019
bcab0af
Update 56575-os_stack-apply_tag_conditionally_to_fix_the_module.yaml
abadger May 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/56575-os_stack-apply_tag_conditionally_to_fix_the_module.yaml
View file
Open in desktop
@@ -0,0 +1,2 @@
bugfixes:
- os_stack - Apply tags conditionally so that the module does not throw up an error when using an older distro of openstacksdk (https://github.com/ansible/ansible/pull/56710)
38 changes: 18 additions & 20 deletions lib/ansible/modules/cloud/openstack/os_stack.py
View file
Open in desktop
Expand Up @@ -154,16 +154,15 @@
from ansible.module_utils._text import to_native


def _create_stack(module, stack, cloud, sdk):
def _create_stack(module, stack, cloud, sdk, parameters):
try:
stack = cloud.create_stack(module.params['name'],
tags=module.params['tag'],
template_file=module.params['template'],
environment_files=module.params['environment'],
timeout=module.params['timeout'],
wait=True,
rollback=module.params['rollback'],
**module.params['parameters'])
**parameters)

stack = cloud.get_stack(stack.id, None)
if stack.stack_status == 'CREATE_COMPLETE':
Expand All @@ -177,17 +176,16 @@ def _create_stack(module, stack, cloud, sdk):
module.fail_json(msg=to_native(e))


def _update_stack(module, stack, cloud, sdk):
def _update_stack(module, stack, cloud, sdk, parameters):
try:
stack = cloud.update_stack(
module.params['name'],
tags=module.params['tag'],
template_file=module.params['template'],
environment_files=module.params['environment'],
timeout=module.params['timeout'],
rollback=module.params['rollback'],
wait=module.params['wait'],
**module.params['parameters'])
**parameters)

if stack['stack_status'] == 'UPDATE_COMPLETE':
return stack
Expand Down Expand Up @@ -242,24 +240,24 @@ def main():
stack = cloud.get_stack(name)

if module.check_mode:
module.exit_json(changed=_system_state_change(module, stack,
cloud))
module.exit_json(changed=_system_state_change(module, stack, cloud))

if state == 'present':
parameters = module.params['parameters']
if module.params['tag']:
parameters['tags'] = module.params['tag']
from distutils.version import StrictVersion
min_version = '0.28.0'
if StrictVersion(sdk.version.__version__) < StrictVersion(min_version) and stack:
module.warn("To update tags using os_stack module, the"
"installed version of the openstacksdk"
"library MUST be >={min_version}"
"".format(min_version=min_version))
if not stack:
stack = _create_stack(module, stack, cloud, sdk)
stack = _create_stack(module, stack, cloud, sdk, parameters)
else:
if module.params['tags']:
from distutils.version import StrictVersion
min_version = '0.28.0'
if StrictVersion(sdk.version.__version__) < StrictVersion(min_version):
module.warn("To update tags using os_stack module, the"
"installed version of the openstacksdk"
"library MUST be >={min_version}"
"".format(min_version=min_version))
stack = _update_stack(module, stack, cloud, sdk)
changed = True
module.exit_json(changed=changed,
stack = _update_stack(module, stack, cloud, sdk, parameters)
module.exit_json(changed=True,
stack=stack,
id=stack.id)
elif state == 'absent':
Expand Down