From 54f5dc3aabf09f3736ea112b97cf857cb7492fbf Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 11 Feb 2019 14:01:26 +0100 Subject: [PATCH] doc: resync group_vars sample files resync group_vars sample files with their corresponding original files. Signed-off-by: Guillaume Abrioux --- group_vars/all.yml.sample | 2 +- group_vars/rhcs.yml.sample | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 8c4f20c5a..883bc1c2b 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -552,7 +552,7 @@ dummy: #ceph_docker_on_openstack: false #containerized_deployment: False #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 '' }}" # this is only here for usage with the rolling_update.yml playbook diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 95fd21b2c..d44c0965b 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -405,6 +405,7 @@ ceph_rhcs_version: 3 #radosgw_address: 0.0.0.0 #radosgw_address_block: subnet #radosgw_keystone_ssl: false # activate this when using keystone PKI keys +#radosgw_num_instances: 1 # Rados Gateway options #email_address: foo@bar.com @@ -551,7 +552,7 @@ ceph_docker_registry: "registry.access.redhat.com/rhceph/" #ceph_docker_on_openstack: false #containerized_deployment: False #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 '' }}" # this is only here for usage with the rolling_update.yml playbook