CN added for all etcd certs

[ta/caas-etcd.git] / ansible / roles / etcd / tasks / main.yml

diff --git a/ansible/roles/etcd/tasks/main.yml b/ansible/roles/etcd/tasks/main.yml
index 4bc8960..2425776 100644 (file)
--- a/ansible/roles/etcd/tasks/main.yml
+++ b/ansible/roles/etcd/tasks/main.yml
@@ -50,11 +50,11 @@
   when: ( nodename | search("caas_master1") ) and ( groups['caas_master']|length|int > 1 )
 
 - name: etcd docker id
-  shell: "docker ps | grep etcd | grep -v pause | awk -F' ' '{ print $1 }'"
+  shell: "docker ps --no-trunc | grep etcd | grep -v pause | grep -v grpc-proxy | awk -F' ' '{ print $1 }'"
   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