Merge pull request #515 from tamsky/ansible/syntax-fixes

contrib/ansible: Fixes 'search' test usage syntax
This commit is contained in:
Erik Wilson 2019-06-18 10:57:45 -07:00 committed by GitHub
commit ffe21ebfa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,7 +6,7 @@
state: absent state: absent
- name: Download k3s binary x64 - name: Download k3s binary x64
get_url: get_url:
url: https://github.com/rancher/k3s/releases/download/{{ k3s_version }}/k3s url: https://github.com/rancher/k3s/releases/download/{{ k3s_version }}/k3s
dest: /usr/local/bin/k3s dest: /usr/local/bin/k3s
owner: root owner: root
@ -16,21 +16,23 @@
when: ( ansible_facts.architecture == "x86_64" ) when: ( ansible_facts.architecture == "x86_64" )
- name: Download k3s binary arm64 - name: Download k3s binary arm64
get_url: get_url:
url: https://github.com/rancher/k3s/releases/download/{{ k3s_version }}/k3s-arm64 url: https://github.com/rancher/k3s/releases/download/{{ k3s_version }}/k3s-arm64
dest: /usr/local/bin/k3s dest: /usr/local/bin/k3s
owner: root owner: root
group: root group: root
mode: 755 mode: 755
when: ( ansible_facts.architecture is search "arm" and when: ( ansible_facts.architecture is search("arm") )
ansible_facts.userspace_bits == "64" ) and
( ansible_facts.userspace_bits == "64" )
- name: Download k3s binary armhf - name: Download k3s binary armhf
get_url: get_url:
url: https://github.com/rancher/k3s/releases/download/{{ k3s_version }}/k3s-armhf url: https://github.com/rancher/k3s/releases/download/{{ k3s_version }}/k3s-armhf
dest: /usr/local/bin/k3s dest: /usr/local/bin/k3s
owner: root owner: root
group: root group: root
mode: 755 mode: 755
when: ( ansible_facts.architecture is search "arm" and when: ( ansible_facts.architecture is search("arm") )
ansible_facts.userspace_bits == "32" ) and
( ansible_facts.userspace_bits == "32" )