From: Dimitri Savineau <dsavinea@redhat.com>
Date: Fri, 10 Jul 2020 14:36:02 +0000 (-0400)
Subject: rhcs: default to containerized deployment
X-Git-Tag: v6.0.0alpha3~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0078230f1de18b4a4982bbfc7df1e48c61a37b12;p=ceph-ansible.git

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 2ba95134b..a44a70727 100644
--- 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 4eda244f2..07375672e 100644
--- 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"