rhcs: default to containerized deployment

Starting RHCS 5, only containerized deployment is available.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 2ba95134bf5f725a69b382b095d36785eeca43ce..a44a70727d411cfd89bd2b1533eac43801ebf8a4 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -569,7 +569,7 @@ ceph_docker_registry_auth: true
 #ceph_client_docker_image: "{{ ceph_docker_image }}"
 #ceph_client_docker_image_tag: "{{ ceph_docker_image_tag }}"
 #ceph_client_docker_registry: "{{ ceph_docker_registry }}"
-#containerized_deployment: False
+containerized_deployment: true
 #container_binary:
 #timeout_command: "{{ 'timeout --foreground -s KILL ' ~ docker_pull_timeout if (docker_pull_timeout != '0') and (ceph_docker_dev_image is undefined or not ceph_docker_dev_image) else '' }}"
 

diff --git a/rhcs_edits.txt b/rhcs_edits.txt
index 4eda244f2d04aeed436c242f01581fe22467c067..07375672eacc7a026bbed4c27b005f03c877f441 100644 (file)
--- a/rhcs_edits.txt
+++ b/rhcs_edits.txt
@@ -3,6 +3,7 @@ ceph_origin: repository
 ceph_iscsi_config_dev: false
 fetch_directory: ~/ceph-ansible-keys
 ceph_rhcs_version: 5
+containerized_deployment: true
 ceph_docker_image: "rhceph/rhceph-5-rhel8"
 ceph_docker_image_tag: "latest"
 ceph_docker_registry: "registry.redhat.io"