From 26fbfdd8d2c6c526620cc848a22483035270965a Mon Sep 17 00:00:00 2001 From: Balint Varga Date: Fri, 26 Jul 2019 09:12:58 +0200 Subject: [PATCH] CN added for all etcd certs Signed-off-by: Balint Varga Change-Id: I0f3add64ca03a6a0d37235fbf911d9a593c0ff60 --- ansible/roles/etcd/meta/main.yml | 1 + ansible/roles/etcd/tasks/add_member.yml | 2 +- ansible/roles/etcd/tasks/main.yml | 4 ++-- ansible/roles/etcd/tasks/try_add_member.yml | 4 ++-- caas-etcd.spec | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ansible/roles/etcd/meta/main.yml b/ansible/roles/etcd/meta/main.yml index 3c55c93..cc3cd71 100644 --- a/ansible/roles/etcd/meta/main.yml +++ b/ansible/roles/etcd/meta/main.yml @@ -49,6 +49,7 @@ dependencies: - role: cert instance: "etcd{{ nodeindex }}" cert_path: /etc/etcd/ssl + common_name: "etcd" alt_names: ip: "{{ lookup('template', 'caas-master-nodes.j2') | from_yaml }}" diff --git a/ansible/roles/etcd/tasks/add_member.yml b/ansible/roles/etcd/tasks/add_member.yml index f33c541..cc40614 100644 --- a/ansible/roles/etcd/tasks/add_member.yml +++ b/ansible/roles/etcd/tasks/add_member.yml @@ -38,7 +38,7 @@ environment: DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375" DOCKER_TLS_VERIFY: "1" - DOCKER_CERT_PATH: "/etc/docker" + DOCKER_CERT_PATH: "{{ caas.cert_directory }}" register: etcd_container_id_add_member until: etcd_container_id_add_member.stdout retries: 50 diff --git a/ansible/roles/etcd/tasks/main.yml b/ansible/roles/etcd/tasks/main.yml index 3c0636f..2425776 100644 --- a/ansible/roles/etcd/tasks/main.yml +++ b/ansible/roles/etcd/tasks/main.yml @@ -54,7 +54,7 @@ environment: DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375" DOCKER_TLS_VERIFY: "1" - DOCKER_CERT_PATH: "/etc/docker" + DOCKER_CERT_PATH: "{{ caas.cert_directory }}" register: etcd_container_id until: etcd_container_id.stdout delay: 5 @@ -65,7 +65,7 @@ environment: DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375" DOCKER_TLS_VERIFY: "1" - DOCKER_CERT_PATH: "/etc/docker" + DOCKER_CERT_PATH: "{{ caas.cert_directory }}" register: result until: result.stdout|int == master_list|length|int delay: 5 diff --git a/ansible/roles/etcd/tasks/try_add_member.yml b/ansible/roles/etcd/tasks/try_add_member.yml index 15b2aed..2abdbc9 100644 --- a/ansible/roles/etcd/tasks/try_add_member.yml +++ b/ansible/roles/etcd/tasks/try_add_member.yml @@ -18,7 +18,7 @@ environment: DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375" DOCKER_TLS_VERIFY: "1" - DOCKER_CERT_PATH: "/etc/docker" + DOCKER_CERT_PATH: "{{ caas.cert_directory }}" register: member_add_result until: (member_add_result.stdout.find("exists") != -1 ) or (member_add_result.stdout.find("added") != -1 ) delay: 10 @@ -29,7 +29,7 @@ environment: DOCKER_HOST: "tcp://{{ networking.infra_internal.ip }}:2375" DOCKER_TLS_VERIFY: "1" - DOCKER_CERT_PATH: "/etc/docker" + DOCKER_CERT_PATH: "{{ caas.cert_directory }}" register: addresult - set_fact: diff --git a/caas-etcd.spec b/caas-etcd.spec index 0a80f02..34cbdad 100644 --- a/caas-etcd.spec +++ b/caas-etcd.spec @@ -15,7 +15,7 @@ %define COMPONENT etcd %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 3.3.13 -%define RPM_MINOR_VERSION 4 +%define RPM_MINOR_VERSION 5 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save -- 2.16.6