set docker_exec_cmd fact early in each role

This is to ensure `docker_exec_cmd` fact is set with the correct value
in case of daemons collocation

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/roles/ceph-iscsi-gw/tasks/main.yml b/roles/ceph-iscsi-gw/tasks/main.yml
index 3cde512fb347571ff4206e79c8c2eabe40a811f4..d2bf4ab07ab12cb36f76edafd3c0ba18c3efe80e 100644 (file)
--- a/roles/ceph-iscsi-gw/tasks/main.yml
+++ b/roles/ceph-iscsi-gw/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: set_fact docker_exec_cmd
+  set_fact:
+    docker_exec_cmd: "docker exec ceph-iscsi-gw-{{ ansible_hostname }}"
+  when:
+    - containerized_deployment
+
 - name: check_mandatory_vars.yml
   include: check_mandatory_vars.yml
 

diff --git a/roles/ceph-mds/tasks/main.yml b/roles/ceph-mds/tasks/main.yml
index 7ba25cce1b7a1e8261bc97beda233896ebaeac1a..88c6174e78013cbd3dcb709216008404b787701b 100644 (file)
--- a/roles/ceph-mds/tasks/main.yml
+++ b/roles/ceph-mds/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: set_fact docker_exec_cmd
+  set_fact:
+    docker_exec_cmd: "docker exec ceph-mds-{{ ansible_hostname }}"
+  when:
+    - containerized_deployment
+
 - name: non_containerized.yml
   include: non_containerized.yml
   when: not containerized_deployment

diff --git a/roles/ceph-mgr/tasks/main.yml b/roles/ceph-mgr/tasks/main.yml
index f2b42763cab57e6aa5a0fce2017182fc1d7050ca..e3a0bb244d6cef280d152ef11e6bb99ce9d820c4 100644 (file)
--- a/roles/ceph-mgr/tasks/main.yml
+++ b/roles/ceph-mgr/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: set_fact docker_exec_cmd
+  set_fact:
+    docker_exec_cmd: "docker exec ceph-mgr-{{ ansible_hostname }}"
+  when:
+    - containerized_deployment
+
 - name: include pre_requisite.yml
   include: pre_requisite.yml
   when: not containerized_deployment

diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index 34bf97315cb1596d776c6041ea6d9196a9708e7f..8debfd86097d3bde52279693fd40a69198837b2c 100644 (file)
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: set_fact docker_exec_cmd
+  set_fact:
+    docker_exec_cmd: "docker exec ceph-mon-{{ ansible_hostname }}"
+  when:
+    - containerized_deployment
+
 - name: include check_mandatory_vars.yml
   include: check_mandatory_vars.yml
 

diff --git a/roles/ceph-nfs/tasks/main.yml b/roles/ceph-nfs/tasks/main.yml
index 435628ed39ce94680a622be7b9e2a924b4c595d8..e395a1500302b5468fbf53bc6955654f102adb2e 100644 (file)
--- a/roles/ceph-nfs/tasks/main.yml
+++ b/roles/ceph-nfs/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: set_fact docker_exec_cmd
+  set_fact:
+    docker_exec_cmd: "docker exec ceph-nfs-{{ ansible_hostname }}"
+  when:
+    - containerized_deployment
+
 - name: include pre_requisite_non_container.yml
   include: pre_requisite_non_container.yml
   when:

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index d405cb75f4e56717577997f61768c05ae7ee53b8..e54a27871b414749b1f0fc6ebdef2f738e95b2ee 100644 (file)
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: set_fact docker_exec_cmd
+  set_fact:
+    docker_exec_cmd: "docker exec ceph-osd-{{ ansible_hostname }}"
+  when:
+    - containerized_deployment
+
 - name: include check_mandatory_vars.yml
   include: check_mandatory_vars.yml
 

diff --git a/roles/ceph-rbd-mirror/tasks/main.yml b/roles/ceph-rbd-mirror/tasks/main.yml
index c2e753f751dc4f35600b9c317eaa9dac44f96aaa..88d264e78a543f70aefadef05add4f7c07d80ae7 100644 (file)
--- a/roles/ceph-rbd-mirror/tasks/main.yml
+++ b/roles/ceph-rbd-mirror/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: set_fact docker_exec_cmd
+  set_fact:
+    docker_exec_cmd: "docker exec ceph-rbd-mirror-{{ ansible_hostname }}"
+  when:
+    - containerized_deployment
+
 - name: include pre_requisite.yml
   include: pre_requisite.yml
   when:

diff --git a/roles/ceph-restapi/tasks/main.yml b/roles/ceph-restapi/tasks/main.yml
index 1507a193eb9b6a5ea7d8bb7eba62ce5be573efd2..851b78ea09a9dadfc90dabb82db4c1debc3f8e23 100644 (file)
--- a/roles/ceph-restapi/tasks/main.yml
+++ b/roles/ceph-restapi/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: set_fact docker_exec_cmd
+  set_fact:
+    docker_exec_cmd: "docker exec ceph-restapi-{{ ansible_hostname }}"
+  when:
+    - containerized_deployment
+
 - name: include pre_requisite.yml
   include: pre_requisite.yml
   when:

diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml
index 549fcc1c68b9a6f7292f55230f201eeeb3372cdc..1f7d589dfc339122a10bc3f9ac67fd787a4041c7 100644 (file)
--- a/roles/ceph-rgw/tasks/main.yml
+++ b/roles/ceph-rgw/tasks/main.yml
@@ -1,4 +1,10 @@
 ---
+- name: set_fact docker_exec_cmd
+  set_fact:
+    docker_exec_cmd: "docker exec ceph-rgw-{{ ansible_hostname }}"
+  when:
+    - containerized_deployment
+
 - name: include pre_requisite.yml
   include: pre_requisite.yml
   when: