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

Fixes for recent ansible versions #7

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixes for recent ansible versions #7

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
517b38f
Fix conditional logic by removing `var|d()` structures
jinnko Feb 9, 2018
1cf7861
Replace `split|last|first` with `urlsplit()` filter
jinnko Feb 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ hashicorp__src: '{{ (ansible_local.root.src
if (ansible_local|d() and ansible_local.root|d() and
ansible_local.root.src|d())
else "/usr/local/src") + "/" + hashicorp__user + "/" +
(hashicorp__base_url.split("://")|last | split("/") | first) }}'
(hashicorp__base_url|urlsplit("hostname")) }}'

# ]]]
# .. envvar:: hashicorp__lib [[[
Expand Down
18 changes: 9 additions & 9 deletions tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@
with_nested:
- '{{ (hashicorp__applications + hashicorp__dependent_applications) | unique }}'
- [ '{{ hashicorp__tar_suffix }}', '{{ hashicorp__hash_suffix }}', '{{ hashicorp__sig_suffix }}' ]
when: (ansible_local is undefined or (ansible_local|d() and (ansible_local.hashicorp is undefined or
(ansible_local.hashicorp|d() and ansible_local.hashicorp.applications|d() and
(ansible_local.hashicorp.applications[item.0] is undefined or
when: (ansible_local is undefined or (ansible_local is defined and (ansible_local.hashicorp is undefined or
(ansible_local.hashicorp is defined and ansible_local.hashicorp.applications is defined and
(ansible_local.hashicorp.applications[item.0] is undefined or
(ansible_local.hashicorp.applications[item.0] != hashicorp__combined_version_map[item.0]))))))
tags: [ 'role::hashicorp:download', 'role::hashicorp:verify' ]

Expand All @@ -133,8 +133,8 @@
- [ '{{ hashicorp__consul_webui_suffix }}' ]
when: (hashicorp__consul_webui|bool and
('consul' in (hashicorp__applications + hashicorp__dependent_applications) | unique) and
(ansible_local is undefined or (ansible_local|d() and ansible_local.hashicorp is undefined or
(ansible_local.hashicorp|d() and ansible_local.hashicorp.applications|d() and
(ansible_local is undefined or (ansible_local is defined and ansible_local.hashicorp is undefined or
(ansible_local.hashicorp is defined and ansible_local.hashicorp.applications is defined and
(ansible_local.hashicorp.applications['consul'] is undefined or
(ansible_local.hashicorp.applications['consul'] != hashicorp__combined_version_map['consul'])) or
not ansible_local.hashicorp.consul_webui | bool))))
Expand Down Expand Up @@ -178,7 +178,7 @@
dest: '{{ hashicorp__lib + "/" + item + "/" + hashicorp__combined_version_map[item] }}'
creates: '{{ hashicorp__lib + "/" + item + "/" + hashicorp__combined_version_map[item] + "/" +
((hashicorp__combined_binary_map[item] if hashicorp__combined_binary_map[item] is string else hashicorp__combined_binary_map[item]|first)
if hashicorp__combined_binary_map[item]|d() else item) }}'
if hashicorp__combined_binary_map[item] is defined else item) }}'
with_items: '{{ (hashicorp__applications + hashicorp__dependent_applications) | unique }}'
register: hashicorp__register_unpack
tags: [ 'role::hashicorp:unpack', 'role::hashicorp:install' ]
Expand All @@ -201,7 +201,7 @@
- name: Install HashiCorp applications
shell: install --mode 755 --owner root --group root --target-directory {{ hashicorp__bin }}
{{ ((hashicorp__combined_binary_map[item.0] if hashicorp__combined_binary_map[item.0] is string else hashicorp__combined_binary_map[item.0] | join(' '))
if hashicorp__combined_binary_map[item.0]|d() else item.0) }}
if hashicorp__combined_binary_map[item.0] is defined else item.0) }}
{% if item.0 == 'terraform' %}
; find . -maxdepth 1 -type f -name 'terraform-*' -exec install -m 755 -o root -g root -t {{ hashicorp__bin }} {} +
{% endif %}
Expand All @@ -210,9 +210,9 @@
with_together:
- '{{ (hashicorp__applications + hashicorp__dependent_applications) | unique }}'
- '{{ hashicorp__register_unpack.results }}'
when: (item.1|changed or (ansible_local|d() and
when: (item.1|changed or (ansible_local is defined and
(ansible_local.hashicorp is undefined or
(ansible_local.hashicorp|d() and ansible_local.hashicorp.applications|d() and
(ansible_local.hashicorp is defined and ansible_local.hashicorp.applications is defined and
(ansible_local.hashicorp.applications[item.0] is undefined or
(ansible_local.hashicorp.applications[item.0] != hashicorp__combined_version_map[item.0]))))))
tags: [ 'role::hashicorp:install' ]
Expand Down