diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-10-03 21:50:25 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-10-23 14:20:27 +0200 |
| commit | 657cf2a8290d7ba1d3307234f7214b09f5fbeb90 (patch) | |
| tree | a157f9afcde45db4dabac9f84b0d76afa990e06b /roles/etcd/tasks/certificates/fetch_server_certificates_from_ca.yml | |
| parent | 75fc5ef69b792d9595918383286b0d9e45eda848 (diff) | |
| download | openshift-657cf2a8290d7ba1d3307234f7214b09f5fbeb90.tar.gz openshift-657cf2a8290d7ba1d3307234f7214b09f5fbeb90.tar.bz2 openshift-657cf2a8290d7ba1d3307234f7214b09f5fbeb90.tar.xz openshift-657cf2a8290d7ba1d3307234f7214b09f5fbeb90.zip | |
etcd: remove hacks for the system container
Use ADDTL_MOUNTS to add a bind mount to the etcd configuration.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles/etcd/tasks/certificates/fetch_server_certificates_from_ca.yml')
| -rw-r--r-- | roles/etcd/tasks/certificates/fetch_server_certificates_from_ca.yml | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/roles/etcd/tasks/certificates/fetch_server_certificates_from_ca.yml b/roles/etcd/tasks/certificates/fetch_server_certificates_from_ca.yml index 26492fb3c..00b8f4a0b 100644 --- a/roles/etcd/tasks/certificates/fetch_server_certificates_from_ca.yml +++ b/roles/etcd/tasks/certificates/fetch_server_certificates_from_ca.yml @@ -12,9 +12,6 @@ - "{{ etcd_cert_config_dir }}/{{ etcd_cert_prefix }}server.crt" - "{{ etcd_cert_config_dir }}/{{ etcd_cert_prefix }}peer.crt" - "{{ etcd_cert_config_dir }}/{{ etcd_cert_prefix }}ca.crt" - - "{{ etcd_system_container_cert_config_dir }}/{{ etcd_cert_prefix }}server.crt" - - "{{ etcd_system_container_cert_config_dir }}/{{ etcd_cert_prefix }}peer.crt" - - "{{ etcd_system_container_cert_config_dir }}/{{ etcd_cert_prefix }}ca.crt" register: g_etcd_server_cert_stat_result when: not etcd_certificates_redeploy | default(false) | bool @@ -141,7 +138,6 @@ state: directory with_items: - "{{ etcd_cert_config_dir }}" - - "{{ etcd_system_container_cert_config_dir }}" when: etcd_server_certs_missing | bool - name: Unarchive cert tarball @@ -176,25 +172,8 @@ state: directory with_items: - "{{ etcd_ca_dir }}" - - "{{ etcd_system_container_cert_config_dir }}/ca" when: etcd_server_certs_missing | bool -- name: Unarchive cert tarball for the system container - unarchive: - src: "{{ g_etcd_server_mktemp.stdout }}/{{ etcd_cert_subdir }}.tgz" - dest: "{{ etcd_system_container_cert_config_dir }}" - when: - - etcd_server_certs_missing | bool - - r_etcd_common_etcd_runtime == 'runc' - -- name: Unarchive etcd ca cert tarballs for the system container - unarchive: - src: "{{ g_etcd_server_mktemp.stdout }}/{{ etcd_ca_name }}.tgz" - dest: "{{ etcd_system_container_cert_config_dir }}/ca" - when: - - etcd_server_certs_missing | bool - - r_etcd_common_etcd_runtime == 'runc' - - name: Delete temporary directory local_action: file path="{{ g_etcd_server_mktemp.stdout }}" state=absent become: no |