From: Dimitri Savineau <dsavinea@redhat.com>
Date: Thu, 24 Oct 2019 14:02:10 +0000 (-0400)
Subject: add-{mon,osd}: add ceph-container-engine role
X-Git-Tag: v4.0.4~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f36306ebf44142b844b91bb82992879b82a3203c;p=ceph-ansible.git

add-{mon,osd}: add ceph-container-engine role

The ceph-container-engine role is missing from both playbooks so the
container engine (docker, podman) isn't install resulting in a failure
on the added nodes.

fatal: [xxxxx]: FAILED! => changed=false
  cmd: docker --version
  msg: '[Errno 2] No such file or directory'
  rc: 2

Closes: #4634

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit bfb1d6be12541bb0fff4db07a6389fc9ea24ac51)
---

diff --git a/infrastructure-playbooks/add-mon.yml b/infrastructure-playbooks/add-mon.yml
index ae561862c..55cfa3a64 100644
--- a/infrastructure-playbooks/add-mon.yml
+++ b/infrastructure-playbooks/add-mon.yml
@@ -29,6 +29,19 @@
         name: ceph-facts
     - import_role:
         name: ceph-validate
+    - import_role:
+        name: ceph-infra
+    - import_role:
+        name: ceph-handler
+    - import_role:
+        name: ceph-common
+      when: not containerized_deployment | bool
+    - import_role:
+        name: ceph-container-engine
+      when: containerized_deployment | bool
+    - import_role:
+        name: ceph-container-common
+      when: containerized_deployment | bool
 
 - hosts: mons
   gather_facts: false
@@ -40,16 +53,8 @@
         name: ceph-facts
     - import_role:
         name: ceph-handler
-    - import_role:
-        name: ceph-common
-      when: not containerized_deployment | bool
-    - import_role:
-        name: ceph-container-common
-      when: containerized_deployment | bool
     - import_role:
         name: ceph-config
-    - import_role:
-        name: ceph-infra
     - import_role:
         name: ceph-mon
 
diff --git a/infrastructure-playbooks/add-osd.yml b/infrastructure-playbooks/add-osd.yml
index bd1ae3354..838785924 100644
--- a/infrastructure-playbooks/add-osd.yml
+++ b/infrastructure-playbooks/add-osd.yml
@@ -73,6 +73,22 @@
       run_once: True
       when: delegate_facts_host | bool
 
+    - import_role:
+        name: ceph-facts
+    - import_role:
+        name: ceph-handler
+    - import_role:
+        name: ceph-infra
+    - import_role:
+        name: ceph-container-engine
+      when: containerized_deployment | bool
+    - import_role:
+        name: ceph-container-common
+      when: containerized_deployment | bool
+    - import_role:
+        name: ceph-common
+      when: not containerized_deployment | bool
+
     # this task is needed so we can skip the openstack_config.yml include in roles/ceph-osd
     - name: set_fact add_osd
       set_fact:
@@ -90,24 +106,10 @@
 
     - import_role:
         name: ceph-facts
-
     - import_role:
         name: ceph-handler
-
-    - import_role:
-        name: ceph-infra
-
-    - import_role:
-        name: ceph-container-common
-      when: containerized_deployment | bool
-
-    - import_role:
-        name: ceph-common
-      when: not containerized_deployment | bool
-
     - import_role:
         name: ceph-config
-
     - import_role:
         name: ceph-osd