use ceph-docker-common in roles that support docker deployments

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit c07b7ddbaaf4effa9c8246a8759644898fb1a37c)

diff --git a/roles/ceph-mds/meta/main.yml b/roles/ceph-mds/meta/main.yml
index cd2ec79c1a1cb3f2dffe02e2cc51e0317cb68852..dc86bd0f3c9bbb78b4b5e1807452977fb0c06c0f 100644 (file)
--- a/roles/ceph-mds/meta/main.yml
+++ b/roles/ceph-mds/meta/main.yml
@@ -12,3 +12,4 @@ galaxy_info:
     - system
 dependencies:
   - { role: ceph.ceph-common, when: not mds_containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: mds_containerized_deployment }

diff --git a/roles/ceph-mon/meta/main.yml b/roles/ceph-mon/meta/main.yml
index 1dff82653323f6ca52cf3dfb0f7ee10a10000e27..9dd5c89f53427c259eb4981391a5aab31a4b23dd 100644 (file)
--- a/roles/ceph-mon/meta/main.yml
+++ b/roles/ceph-mon/meta/main.yml
@@ -12,3 +12,4 @@ galaxy_info:
     - system
 dependencies:
   - { role: ceph.ceph-common, when: not mon_containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: mon_containerized_deployment }

diff --git a/roles/ceph-nfs/meta/main.yml b/roles/ceph-nfs/meta/main.yml
index 800a2589adda99f8e273e0d93ff7cd1cc043c647..4efb5d920382afd230d2345a278b17b86108d9b1 100644 (file)
--- a/roles/ceph-nfs/meta/main.yml
+++ b/roles/ceph-nfs/meta/main.yml
@@ -12,3 +12,4 @@ galaxy_info:
     - system
 dependencies:
   - { role: ceph.ceph-common, when: not nfs_containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: nfs_containerized_deployment }

diff --git a/roles/ceph-osd/meta/main.yml b/roles/ceph-osd/meta/main.yml
index 9c5b77fd7978cbd7c14799ba033a863f3a2ced34..e1d85c157dbcb89ad1511a43e1debb4db46335ea 100644 (file)
--- a/roles/ceph-osd/meta/main.yml
+++ b/roles/ceph-osd/meta/main.yml
@@ -12,3 +12,4 @@ galaxy_info:
     - system
 dependencies:
   - { role: ceph.ceph-common, when: not osd_containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: osd_containerized_deployment }

diff --git a/roles/ceph-rbd-mirror/meta/main.yml b/roles/ceph-rbd-mirror/meta/main.yml
index bb297c9ca2938f1965a7475cabf10f5b8726036f..a70fe441854823c09874e1aad919bc5ecfa646ee 100644 (file)
--- a/roles/ceph-rbd-mirror/meta/main.yml
+++ b/roles/ceph-rbd-mirror/meta/main.yml
@@ -15,3 +15,4 @@ galaxy_info:
     - system
 dependencies:
   - { role: ceph.ceph-common, when: not rbd_mirror_containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: rbd_mirror_containerized_deployment }

diff --git a/roles/ceph-restapi/meta/main.yml b/roles/ceph-restapi/meta/main.yml
index da3adeb37b06d6999ad53cd46927875c7b6113b7..f2a9c28558ce814a30056980bda1d3ccce144f1a 100644 (file)
--- a/roles/ceph-restapi/meta/main.yml
+++ b/roles/ceph-restapi/meta/main.yml
@@ -12,3 +12,4 @@ galaxy_info:
     - system
 dependencies:
   - { role: ceph.ceph-common, when: not restapi_containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: restapi_containerized_deployment }

diff --git a/roles/ceph-rgw/meta/main.yml b/roles/ceph-rgw/meta/main.yml
index 6cb4c6d638c43b938a22ab29cf3fe59d7239a769..051f5e0ec54b6ef0c4b952a9bd0512600bd26a75 100644 (file)
--- a/roles/ceph-rgw/meta/main.yml
+++ b/roles/ceph-rgw/meta/main.yml
@@ -12,3 +12,4 @@ galaxy_info:
     - system
 dependencies:
   - { role: ceph.ceph-common, when: not rgw_containerized_deployment }
+  - { role: ceph.ceph-docker-common, when: rgw_containerized_deployment }