diff options
Diffstat (limited to 'roles/etcd_certificates/tasks')
| -rw-r--r-- | roles/etcd_certificates/tasks/client.yml | 8 | ||||
| -rw-r--r-- | roles/etcd_certificates/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/etcd_certificates/tasks/server.yml | 12 | 
3 files changed, 12 insertions, 12 deletions
| diff --git a/roles/etcd_certificates/tasks/client.yml b/roles/etcd_certificates/tasks/client.yml index 7bf95809f..b497a46c0 100644 --- a/roles/etcd_certificates/tasks/client.yml +++ b/roles/etcd_certificates/tasks/client.yml @@ -4,7 +4,7 @@      path: "{{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }}"      state: directory      mode: 0700 -  with_items: etcd_needing_client_certs +  with_items: "{{ etcd_needing_client_certs | default([]) }}"  - name: Create the client csr    command: > @@ -19,7 +19,7 @@                   ~ item.etcd_cert_prefix ~ 'client.csr' }}"    environment:      SAN: "IP:{{ item.etcd_ip }}" -  with_items: etcd_needing_client_certs +  with_items: "{{ etcd_needing_client_certs | default([]) }}"  - name: Sign and create the client crt    command: > @@ -33,10 +33,10 @@                   ~ item.etcd_cert_prefix ~ 'client.crt' }}"    environment:      SAN: "IP:{{ item.etcd_ip }}" -  with_items: etcd_needing_client_certs +  with_items: "{{ etcd_needing_client_certs | default([]) }}"  - file:      src: "{{ etcd_ca_cert }}"      dest: "{{ etcd_generated_certs_dir}}/{{ item.etcd_cert_subdir }}/{{ item.etcd_cert_prefix }}ca.crt"      state: hard -  with_items: etcd_needing_client_certs +  with_items: "{{ etcd_needing_client_certs | default([]) }}" diff --git a/roles/etcd_certificates/tasks/main.yml b/roles/etcd_certificates/tasks/main.yml index 3bb715943..17092ca58 100644 --- a/roles/etcd_certificates/tasks/main.yml +++ b/roles/etcd_certificates/tasks/main.yml @@ -1,6 +1,6 @@  ---  - include: client.yml -  when: etcd_needing_client_certs is defined and etcd_needing_client_certs +  when: etcd_needing_client_certs | default([]) | length > 0  - include: server.yml -  when: etcd_needing_server_certs is defined and etcd_needing_server_certs +  when: etcd_needing_server_certs | default([]) | length > 0 diff --git a/roles/etcd_certificates/tasks/server.yml b/roles/etcd_certificates/tasks/server.yml index 2589c5192..934b8b805 100644 --- a/roles/etcd_certificates/tasks/server.yml +++ b/roles/etcd_certificates/tasks/server.yml @@ -4,7 +4,7 @@      path: "{{ etcd_generated_certs_dir }}/{{ item.etcd_cert_subdir }}"      state: directory      mode: 0700 -  with_items: etcd_needing_server_certs +  with_items: "{{ etcd_needing_server_certs | default([]) }}"  - name: Create the server csr    command: > @@ -19,7 +19,7 @@                   ~ item.etcd_cert_prefix ~ 'server.csr' }}"    environment:      SAN: "IP:{{ item.etcd_ip }}" -  with_items: etcd_needing_server_certs +  with_items: "{{ etcd_needing_server_certs  | default([]) }}"  - name: Sign and create the server crt    command: > @@ -33,7 +33,7 @@                   ~ item.etcd_cert_prefix ~ 'server.crt' }}"    environment:      SAN: "IP:{{ item.etcd_ip }}" -  with_items: etcd_needing_server_certs +  with_items: "{{ etcd_needing_server_certs  | default([]) }}"  - name: Create the peer csr    command: > @@ -48,7 +48,7 @@                   ~ item.etcd_cert_prefix ~ 'peer.csr' }}"    environment:      SAN: "IP:{{ item.etcd_ip }}" -  with_items: etcd_needing_server_certs +  with_items: "{{ etcd_needing_server_certs | default([]) }}"  - name: Sign and create the peer crt    command: > @@ -62,10 +62,10 @@                   ~ item.etcd_cert_prefix ~ 'peer.crt' }}"    environment:      SAN: "IP:{{ item.etcd_ip }}" -  with_items: etcd_needing_server_certs +  with_items: "{{ etcd_needing_server_certs | default([]) }}"  - file:      src: "{{ etcd_ca_cert }}"      dest: "{{ etcd_generated_certs_dir}}/{{ item.etcd_cert_subdir }}/{{ item.etcd_cert_prefix }}ca.crt"      state: hard -  with_items: etcd_needing_server_certs +  with_items: "{{ etcd_needing_server_certs | default([]) }}" | 
