From 145e5c8943010fd44082f08f85c4ee148b63254a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=97=AD?= Date: Thu, 27 Sep 2018 17:12:02 +0800 Subject: [PATCH] use copy and slurp module (#3313) --- roles/etcd/tasks/gen_certs_script.yml | 124 +++++++++----------------- roles/etcd/tasks/install_host.yml | 24 ++--- 2 files changed, 47 insertions(+), 101 deletions(-) diff --git a/roles/etcd/tasks/gen_certs_script.yml b/roles/etcd/tasks/gen_certs_script.yml index 8ef9a3dcc..8a828aa2b 100644 --- a/roles/etcd/tasks/gen_certs_script.yml +++ b/roles/etcd/tasks/gen_certs_script.yml @@ -71,101 +71,61 @@ - inventory_hostname == groups['etcd'][0] notify: set etcd_secret_changed -- set_fact: - all_master_certs: "['ca-key.pem', - {% for node in groups['etcd'] %} - 'admin-{{ node }}.pem', - 'admin-{{ node }}-key.pem', - 'member-{{ node }}.pem', - 'member-{{ node }}-key.pem', - {% endfor %}]" - my_master_certs: ['ca-key.pem', - 'admin-{{ inventory_hostname }}.pem', - 'admin-{{ inventory_hostname }}-key.pem', - 'member-{{ inventory_hostname }}.pem', - 'member-{{ inventory_hostname }}-key.pem'] - all_node_certs: "['ca.pem', - {% for node in (groups['k8s-cluster'] + groups['calico-rr']|default([]))|unique %} - 'node-{{ node }}.pem', - 'node-{{ node }}-key.pem', - {% endfor %}]" - my_node_certs: ['ca.pem', 'node-{{ inventory_hostname }}.pem', 'node-{{ inventory_hostname }}-key.pem'] - tags: - - 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" - args: - executable: /bin/bash - register: etcd_master_cert_data - no_log: true - check_mode: no + slurp: + src: "{{ item }}" + register: etcd_master_certs + with_items: + - "{{ etcd_cert_dir }}/ca.pem" + - "{{ etcd_cert_dir }}/ca-key.pem" + - "[{% for node in groups['etcd'] %} + '{{ etcd_cert_dir }}/admin-{{ node }}.pem', + '{{ etcd_cert_dir }}/admin-{{ node }}-key.pem', + '{{ etcd_cert_dir }}/member-{{ node }}.pem', + '{{ etcd_cert_dir }}/member-{{ node }}-key.pem', + {% endfor %}]" + - "[{% for node in (groups['k8s-cluster'] + groups['calico-rr']|default([]))|unique %} + '{{ etcd_cert_dir }}/node-{{ node }}.pem', + '{{ etcd_cert_dir }}/node-{{ node }}-key.pem', + {% endfor %}]" delegate_to: "{{groups['etcd'][0]}}" when: inventory_hostname in groups['etcd'] and sync_certs|default(false) and inventory_hostname != groups['etcd'][0] 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" - args: - executable: /bin/bash - register: etcd_node_cert_data - no_log: true - check_mode: no + slurp: + src: "{{ item }}" + register: etcd_node_certs + with_items: + - "{{ etcd_cert_dir }}/ca.pem" + - "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem" + - "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem" delegate_to: "{{groups['etcd'][0]}}" when: (('calico-rr' in groups and inventory_hostname in groups['calico-rr']) or inventory_hostname in groups['k8s-cluster']) and 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 +- name: Gen_certs | Write etcd master certs 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 }}" - no_log: true - changed_when: false - check_mode: no - when: inventory_hostname in groups['etcd'] and sync_certs|default(false) and - 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 }}" - args: - executable: /bin/bash - changed_when: false - when: sync_certs|default(false) and - inventory_hostname not in groups['etcd'] - -- name: Gen_certs | check certificate permissions - file: - path: "{{ etcd_cert_dir }}" + dest: "{{ item.item }}" + content: "{{ item.content | b64decode }}" group: "{{ etcd_cert_group }}" - state: directory owner: kube - mode: "640" - recurse: yes + mode: 0640 + with_items: "{{ etcd_master_certs.results }}" + when: inventory_hostname in groups['etcd'] and sync_certs|default(false) and + inventory_hostname != groups['etcd'][0] + +- name: Gen_certs | Write etcd node certs + copy: + dest: "{{ item.item }}" + content: "{{ item.content | b64decode }}" + group: "{{ etcd_cert_group }}" + owner: kube + mode: 0640 + with_items: "{{ etcd_node_certs.results }}" + when: (('calico-rr' in groups and inventory_hostname in groups['calico-rr']) or + inventory_hostname in groups['k8s-cluster']) and + sync_certs|default(false) and inventory_hostname not in groups['etcd'] diff --git a/roles/etcd/tasks/install_host.yml b/roles/etcd/tasks/install_host.yml index fe50a7b1a..66d4e3d9a 100644 --- a/roles/etcd/tasks/install_host.yml +++ b/roles/etcd/tasks/install_host.yml @@ -1,25 +1,11 @@ --- - name: install | Copy etcd and etcdctl binary from download dir - synchronize: + copy: src: "{{ local_release_dir }}/etcd-{{ etcd_version }}-linux-amd64/{{ item }}" dest: "{{ bin_dir }}/{{ item }}" - compress: no - perms: yes - owner: no - group: no - changed_when: false - delegate_to: "{{ inventory_hostname }}" + mode: 0755 + remote_src: yes with_items: - - "etcd" - - "etcdctl" - when: etcd_cluster_setup - -- name: install | Set etcd and etcdctl binary permissions - file: - path: "{{ bin_dir }}/{{ item }}" - mode: "0755" - state: file - with_items: - - "etcd" - - "etcdctl" + - etcd + - etcdctl when: etcd_cluster_setup