Ability to collocate bare metal and container

Since we renamed the variables and removed the old 'docker' variable we
can now collocate container daemons with standard bare metal deployment.
For instance, monitors can be containerized but osds can be deployed
traditionally.

Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/all.sample b/group_vars/all.sample
index dbda68c665992e7d01fddcb975dd7e8852dae905..b7fbee6a7a78b445b4799640c3cbe9874e8c6bf5 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -226,10 +226,3 @@ dummy:
 #  - { name: fs.file-max, value: 26234859 }
 #  - { name: vm.zone_reclaim_mode, value: 0 }
 #  - { name: vm.vfs_cache_pressure, value: 50 }
-
-
-##########
-# DOCKER #
-##########
-
-#docker: false

diff --git a/group_vars/mdss.sample b/group_vars/mdss.sample
index 425e2ccee025cc384a6aa2e4bf4cc14850819d7d..fae7bc279da6e93b28b3924b26134f6010739268 100644 (file)
--- a/group_vars/mdss.sample
+++ b/group_vars/mdss.sample
@@ -15,7 +15,7 @@ dummy:
 # DOCKER #\r
 ##########\r
 \r
-#ceph_containerized_deployment: false\r
+#mds_containerized_deployment: false\r
 #ceph_mds_docker_username: ceph\r
 #ceph_mds_docker_imagename: daemon\r
 #ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables\r

diff --git a/group_vars/mons.sample b/group_vars/mons.sample
index 51ef6b3078e7cc7d97880427c9f5b905b46d9796..dc7607b89bc0a76c28f65569e1e5f405830e3bb8 100644 (file)
--- a/group_vars/mons.sample
+++ b/group_vars/mons.sample
@@ -55,7 +55,7 @@ dummy:
 # DOCKER #\r
 ##########\r
 \r
-#ceph_containerized_deployment: false\r
+#mon_containerized_deployment: false\r
 #ceph_mon_docker_username: ceph\r
 #ceph_mon_docker_imagename: "daemon"\r
 #ceph_mon_docker_interface: eth0\r

diff --git a/group_vars/osds.sample b/group_vars/osds.sample
index a5c07a2e04671744b3630d2622c121af2fdcb585..c9516c73e599415e603af77bd205ba9444e25a4b 100644 (file)
--- a/group_vars/osds.sample
+++ b/group_vars/osds.sample
@@ -113,7 +113,7 @@ osd_crush_location: "'root={{ ceph_crush_root }} rack={{ ceph_crush_rack }} host
 # DOCKER #
 ##########
 
-#ceph_containerized_deployment: false
+#osd_containerized_deployment: false
 #ceph_osd_docker_username: ceph
 #ceph_osd_docker_imagename: daemon
 #ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables

diff --git a/group_vars/restapis.sample b/group_vars/restapis.sample
index 42e4095b5c9a7e28ae5e684a54c0cc9531500386..ca6e1b90b01ddb235d60a480fbcb6f4fb248df72 100644 (file)
--- a/group_vars/restapis.sample
+++ b/group_vars/restapis.sample
@@ -14,7 +14,7 @@ dummy:
 # DOCKER #
 ##########
 
-#ceph_containerized_deployment: false
+#restapi_containerized_deployment: false
 #ceph_restapi_docker_interface: eth0
 #ceph_restapi_port: 5000
 #ceph_restapi_docker_username: ceph

diff --git a/group_vars/rgws.sample b/group_vars/rgws.sample
index e00c3eaa03e70805d4c5983efbccb23bf1aa3d85..707c36116b5efeadde495dc96ce724fa3244b262 100644 (file)
--- a/group_vars/rgws.sample
+++ b/group_vars/rgws.sample
@@ -20,7 +20,7 @@ dummy:
 # DOCKER #\r
 ##########\r
 \r
-#ceph_containerized_deployment: false\r
+#rgw_containerized_deployment: false\r
 #ceph_rgw_docker_username: ceph\r
 #ceph_rgw_docker_imagename: daemon\r
 #ceph_rgw_civetweb_port: 80\r

diff --git a/roles/ceph-mds/defaults/main.yml b/roles/ceph-mds/defaults/main.yml
index a5d60a7e0dd0bf6058d0f5c4cbf59a6bb0132e79..1bedb16e071ae2ba065f1909ad6b60a38641a3d3 100644 (file)
--- a/roles/ceph-mds/defaults/main.yml
+++ b/roles/ceph-mds/defaults/main.yml
@@ -14,7 +14,7 @@ cephx: true
 # DOCKER #\r
 ##########\r
 \r
-ceph_containerized_deployment: false\r
+mds_containerized_deployment: false\r
 ceph_mds_docker_username: ceph\r
 ceph_mds_docker_imagename: daemon\r
 ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables\r

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

diff --git a/roles/ceph-mds/tasks/main.yml b/roles/ceph-mds/tasks/main.yml
index 40a43dd0994c7fbc1170521e6a88854c96cce1e7..f932e584a7e358d07debdea71f857076bbf9b039 100644 (file)
--- a/roles/ceph-mds/tasks/main.yml
+++ b/roles/ceph-mds/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - include: pre_requisite.yml
-  when: not ceph_containerized_deployment
+  when: not mds_containerized_deployment
 
 - include: ./docker/main.yml
-  when: ceph_containerized_deployment
+  when: mds_containerized_deployment

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 50fd1e5811db2fe60a11c12d8feab4460c5c79f6..f7360db7dd9ceb8b7bc2710ddcaa643ad855691c 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -60,7 +60,7 @@ openstack_keys:
 # DOCKER #\r
 ##########\r
 \r
-ceph_containerized_deployment: false\r
+mon_containerized_deployment: false\r
 ceph_mon_docker_interface: eth0\r
 #ceph_mon_docker_subnet: # subnet of the ceph_mon_docker_interface\r
 ceph_mon_docker_username: ceph\r

diff --git a/roles/ceph-mon/meta/main.yml b/roles/ceph-mon/meta/main.yml
index 72e176d982562ee57ef13088d3b7769c35b81361..b22c7c3f086687aeee3280773b54fc25b32499f0 100644 (file)
--- a/roles/ceph-mon/meta/main.yml
+++ b/roles/ceph-mon/meta/main.yml
@@ -11,4 +11,4 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph-common, when: not docker }
+  - { role: ceph-common, when: not mon_containerized_deployment }

diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index 1000514347ee9b52fe9b1d98e54caa6cc025c5e7..5b292becad0818aeab42bdb2c600c8f66593ccb8 100644 (file)
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
 - include: deploy_monitors.yml
-  when: not ceph_containerized_deployment
+  when: not mon_containerized_deployment
 
 - include: start_monitor.yml
-  when: not ceph_containerized_deployment
+  when: not mon_containerized_deployment
 
 - include: ceph_keys.yml
-  when: not ceph_containerized_deployment
+  when: not mon_containerized_deployment
 
 - include: create_mds_filesystems.yml
   when:
@@ -16,7 +16,7 @@
 - include: secure_cluster.yml
   when:
     secure_cluster and
-    not ceph_containerized_deployment
+    not mon_containerized_deployment
 
 - include: ./docker/main.yml
-  when: ceph_containerized_deployment
+  when: mon_containerized_deployment

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 0c56a4267742246b39c15c1b58cff7421ce6132a..046a765d4d77f0dfcc0acad502ed41a6c2aceea1 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -108,7 +108,7 @@ osd_directory: false
 # DOCKER #\r
 ##########\r
 \r
-ceph_containerized_deployment: false\r
+osd_containerized_deployment: false\r
 ceph_osd_docker_username: ceph\r
 ceph_osd_docker_imagename: daemon\r
 ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables\r

diff --git a/roles/ceph-osd/meta/main.yml b/roles/ceph-osd/meta/main.yml
index 5d1a82cec14b652aa6da19b5fa4aa92c5fce5973..37b426cf0d3804c72ddbbd92c9288dea6f300818 100644 (file)
--- a/roles/ceph-osd/meta/main.yml
+++ b/roles/ceph-osd/meta/main.yml
@@ -11,4 +11,4 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph-common, when: not docker }
+  - { role: ceph-common, when: not osd_containerized_deployment }

diff --git a/roles/ceph-osd/tasks/main.yml b/roles/ceph-osd/tasks/main.yml
index f6070888f86191e17c92d5755bcf5ae0294dc5b6..4ae3faa2050a794720e40fcec1ec5d788a67e5ae 100644 (file)
--- a/roles/ceph-osd/tasks/main.yml
+++ b/roles/ceph-osd/tasks/main.yml
@@ -1,16 +1,16 @@
 ---
 
 - include: pre_requisite.yml
-  when: not ceph_containerized_deployment
+  when: not osd_containerized_deployment
 
 - include: ./scenarios/journal_collocation.yml
-  when: journal_collocation and not ceph_containerized_deployment
+  when: journal_collocation and not osd_containerized_deployment
 
 - include: ./scenarios/raw_multi_journal.yml
-  when: raw_multi_journal and not ceph_containerized_deployment
+  when: raw_multi_journal and not osd_containerized_deployment
 
 - include: ./scenarios/osd_directory.yml
-  when: osd_directory and not ceph_containerized_deployment
+  when: osd_directory and not osd_containerized_deployment
 
 - include: ./docker/main.yml
-  when: ceph_containerized_deployment
+  when: osd_containerized_deployment

diff --git a/roles/ceph-restapi/defaults/main.yml b/roles/ceph-restapi/defaults/main.yml
index 59236dc44a7268be3e8c1b10e64c2a2d20d11586..c8320c1142ad896289b63e89922b450ae17ac63f 100644 (file)
--- a/roles/ceph-restapi/defaults/main.yml
+++ b/roles/ceph-restapi/defaults/main.yml
@@ -10,7 +10,7 @@ fetch_directory: fetch/
 # DOCKER #
 ##########
 
-ceph_containerized_deployment: false
+restapi_containerized_deployment: false
 ceph_restapi_docker_interface: eth0
 ceph_restapi_port: 5000
 ceph_restapi_docker_username: ceph

diff --git a/roles/ceph-restapi/meta/main.yml b/roles/ceph-restapi/meta/main.yml
index e9e8850eee82385a8995f539f6c65988339f2da0..30a5eb700b4ce7ce2726ee28a718aaa13fc65c73 100644 (file)
--- a/roles/ceph-restapi/meta/main.yml
+++ b/roles/ceph-restapi/meta/main.yml
@@ -11,4 +11,4 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph-common, when: not docker }
+  - { role: ceph-common, when: not restapi_containerized_deployment }

diff --git a/roles/ceph-restapi/tasks/main.yml b/roles/ceph-restapi/tasks/main.yml
index b5d15d6946b93e22930920b9720a12a9d4d3ff0b..571d4c98d9808ad324a8b2ef96e37fdda509e5a2 100644 (file)
--- a/roles/ceph-restapi/tasks/main.yml
+++ b/roles/ceph-restapi/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - include: pre_requisite.yml
-  when: not ceph_containerized_deployment
+  when: not restapi_containerized_deployment
 
 - include: start_restapi.yml
-  when: not ceph_containerized_deployment
+  when: not restapi_containerized_deployment
 
 - include: ./docker/main.yml
-  when: ceph_containerized_deployment
+  when: restapi_containerized_deployment

diff --git a/roles/ceph-rgw/defaults/main.yml b/roles/ceph-rgw/defaults/main.yml
index ca81641f498511f1321d20f97a8c37f390a57f9f..cee4bf9b627cc0e511848fa59efe364d80f3570f 100644 (file)
--- a/roles/ceph-rgw/defaults/main.yml
+++ b/roles/ceph-rgw/defaults/main.yml
@@ -20,7 +20,7 @@ radosgw_user: root
 # DOCKER #\r
 ##########\r
 \r
-ceph_containerized_deployment: false\r
+rgw_containerized_deployment: false\r
 ceph_rgw_civetweb_port: 80\r
 ceph_rgw_docker_username: ceph\r
 ceph_rgw_docker_imagename: daemon\r

diff --git a/roles/ceph-rgw/meta/main.yml b/roles/ceph-rgw/meta/main.yml
index 9fc270d3b76fc8b34f8ce8fabd2cd586f418f005..fe0c03d2ef7ca180a12200659822ad3f1fb965c9 100644 (file)
--- a/roles/ceph-rgw/meta/main.yml
+++ b/roles/ceph-rgw/meta/main.yml
@@ -11,4 +11,4 @@ galaxy_info:
   categories:
     - system
 dependencies:
-  - { role: ceph-common, when: not docker }
+  - { role: ceph-common, when: not rgw_containerized_deployment }

diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml
index 7b7e7305727177365de6a908b73927363ea5e0aa..91c8c9f79034a760beef897212e783744e72596e 100644 (file)
--- a/roles/ceph-rgw/tasks/main.yml
+++ b/roles/ceph-rgw/tasks/main.yml
@@ -1,12 +1,12 @@
 ---
 - include: pre_requisite.yml
-  when: not ceph_containerized_deployment
+  when: not rgw_containerized_deployment
 
 - include: openstack-keystone.yml
   when: radosgw_keystone
 
 - include: start_radosgw.yml
-  when: not ceph_containerized_deployment
+  when: not rgw_containerized_deployment
 
 - include: ./docker/main.yml
-  when: ceph_containerized_deployment
+  when: rgw_containerized_deployment