diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-25 16:22:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-25 16:22:08 -0700 |
| commit | d82771fc2c4da0fea5fd20dece069520f650ebb1 (patch) | |
| tree | dbe4bc230a95ea793bb9edaa06d08a040fe313a7 /roles/etcd/tasks/certificates | |
| parent | 305e4897dd6591ee8055414f80e43275696558d2 (diff) | |
| parent | 657cf2a8290d7ba1d3307234f7214b09f5fbeb90 (diff) | |
| download | openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.tar.gz openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.tar.bz2 openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.tar.xz openshift-d82771fc2c4da0fea5fd20dece069520f650ebb1.zip | |
Merge pull request #5655 from giuseppe/etcd-additional-bind-mount
Automatic merge from submit-queue.
etcd: remove hacks for the system container
This removes the special handling of the etcd directories when running as a system container.
Marked as WIP as it depends from this [change](https://bugzilla.redhat.com/show_bug.cgi?id=1484326) in the etcd image to be reflected into `registry.access.redhat.com/rhel7/etcd`
Diffstat (limited to 'roles/etcd/tasks/certificates')
| -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 |