gen_certs_script: refactor using stdin (Ansible 2.4+)
This commit is contained in:
parent
7a2cfb8578
commit
69786b2d16
1 changed files with 10 additions and 33 deletions
|
@ -94,9 +94,9 @@
|
|||
- facts
|
||||
|
||||
- name: Gen_certs | Gather etcd master certs
|
||||
shell: "tar cfz - -C {{ etcd_cert_dir }} -T /dev/stdin <<< {{ my_master_certs|join(' ') }} {{ all_node_certs|join(' ') }} | base64 --wrap=0"
|
||||
command: "tar cfz - -C {{ etcd_cert_dir }} -T /dev/stdin"
|
||||
args:
|
||||
executable: /bin/bash
|
||||
input: "{{ my_master_certs|join(' ') }} {{ all_node_certs|join(' ') }}"
|
||||
register: etcd_master_cert_data
|
||||
no_log: true
|
||||
check_mode: no
|
||||
|
@ -106,9 +106,9 @@
|
|||
notify: set etcd_secret_changed
|
||||
|
||||
- name: Gen_certs | Gather etcd node certs
|
||||
shell: "tar cfz - -C {{ etcd_cert_dir }} -T /dev/stdin <<< {{ my_node_certs|join(' ') }} | base64 --wrap=0"
|
||||
command: "tar cfz - -C {{ etcd_cert_dir }} -T /dev/stdin"
|
||||
args:
|
||||
executable: /bin/bash
|
||||
stdin: "{{ my_node_certs|join(' ') }}"
|
||||
register: etcd_node_cert_data
|
||||
no_log: true
|
||||
check_mode: no
|
||||
|
@ -118,27 +118,10 @@
|
|||
sync_certs|default(false) and inventory_hostname not in groups['etcd']
|
||||
notify: set etcd_secret_changed
|
||||
|
||||
# NOTE(mattymo): Use temporary file to copy master certs because we have a ~200k
|
||||
# char limit when using shell command
|
||||
|
||||
# FIXME(mattymo): Use tempfile module in ansible 2.3
|
||||
- name: Gen_certs | Prepare tempfile for unpacking certs
|
||||
command: mktemp /tmp/certsXXXXX.tar.gz
|
||||
register: cert_tempfile
|
||||
when: inventory_hostname in groups['etcd'] and sync_certs|default(false) and
|
||||
inventory_hostname != groups['etcd'][0]
|
||||
|
||||
- name: Gen_certs | Write master certs to tempfile
|
||||
copy:
|
||||
content: "{{etcd_master_cert_data.stdout}}"
|
||||
dest: "{{cert_tempfile.stdout}}"
|
||||
owner: root
|
||||
mode: "0600"
|
||||
when: inventory_hostname in groups['etcd'] and sync_certs|default(false) and
|
||||
inventory_hostname != groups['etcd'][0]
|
||||
|
||||
- name: Gen_certs | Unpack certs on masters
|
||||
shell: "base64 -d < {{ cert_tempfile.stdout }} | tar xz -C {{ etcd_cert_dir }}"
|
||||
command: "tar xz -C {{ etcd_cert_dir }}"
|
||||
args:
|
||||
stdin: "{{ etcd_master_cert_data.stdout }}"
|
||||
no_log: true
|
||||
changed_when: false
|
||||
check_mode: no
|
||||
|
@ -146,17 +129,11 @@
|
|||
inventory_hostname != groups['etcd'][0]
|
||||
notify: set secret_changed
|
||||
|
||||
- name: Gen_certs | Cleanup tempfile
|
||||
file:
|
||||
path: "{{cert_tempfile.stdout}}"
|
||||
state: absent
|
||||
when: inventory_hostname in groups['etcd'] and sync_certs|default(false) and
|
||||
inventory_hostname != groups['etcd'][0]
|
||||
|
||||
- name: Gen_certs | Copy certs on nodes
|
||||
shell: "base64 -d <<< '{{etcd_node_cert_data.stdout|quote}}' | tar xz -C {{ etcd_cert_dir }}"
|
||||
command: "tar xz -C {{ etcd_cert_dir }}"
|
||||
args:
|
||||
executable: /bin/bash
|
||||
stdin: "{{ etcd_node_cert_data.stdout }}"
|
||||
no_log: true
|
||||
changed_when: false
|
||||
when: sync_certs|default(false) and
|
||||
inventory_hostname not in groups['etcd']
|
||||
|
|
Loading…
Reference in a new issue