group_vars: resync missing options

resync group_vars file with the defaults/main.yml files.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 2dd75a1e6ed6d8b323ef647cbb5cf1d2a2f90154)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index b05682fe17e9dad8a17c8b2f2b13aaac322fa52c..73eda43c400be2f67f8c451931b5ee0f50deefdf 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -524,7 +524,8 @@ dummy:
 #osd_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
 #mds_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
 #rgw_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
-#containerized_deployment: False
+#containerized_deployment: "{{ True if mon_containerized_deployment or osd_containerized_deployment or mds_containerized_deployment or rgw_containerized_deployment else False }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
+
 
 ############
 # KV store #

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 9bd2d3c42a1e8aafb603348e1100e0bc16ac044d..ba867b335e28b41d6f7be398bffdf7a8dcf1940e 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -524,7 +524,8 @@ ceph_rhcs_version: 3
 #osd_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
 #mds_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
 #rgw_containerized_deployment: False # backward compatibility with stable-2.2, will disappear in stable 3.1
-#containerized_deployment: False
+#containerized_deployment: "{{ True if mon_containerized_deployment or osd_containerized_deployment or mds_containerized_deployment or rgw_containerized_deployment else False }}" # backward compatibility with stable-2.2, will disappear in stable 3.1
+
 
 ############
 # KV store #