From 1d696dec2a838c3df4a58b1da7962853377f19c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 23 Aug 2017 15:33:48 +0200 Subject: [PATCH] resync group_vars MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- group_vars/rbd-mirrors.yml.sample | 35 +++++++++++++++++-------------- group_vars/rhcs.yml.sample | 4 ++-- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/group_vars/rbd-mirrors.yml.sample b/group_vars/rbd-mirrors.yml.sample index 66efd701d..994eb98b4 100644 --- a/group_vars/rbd-mirrors.yml.sample +++ b/group_vars/rbd-mirrors.yml.sample @@ -11,24 +11,17 @@ dummy: # SETUP # ######### +#fetch_directory: fetch/ -# NOTE (leseb): the rbd-mirror daemon needs a user to start -# because it has to authenticate with the local cluster. -# By default, using the admin user is fine, so you should not -# need to change 'ceph_rbd_mirror_local_user' unless you have -# a dedicated key available in /etc/ceph/. -# Generally Ansible will use the admin key and put it -# under /etc/ceph/. The same goes for 'ceph_rbd_mirror_remote_user' -# there should not be any reason to change it. -#ceph_rbd_mirror_local_user: admin -#ceph_rbd_mirror_remote_user: admin - -# NOTE (leseb): the following variable needs the name of the remote cluster. -# The name of this cluster must be different than your local cluster simply -# because we need to have both keys and ceph.conf inside /etc/ceph. -# Thus if cluster names are identical we can not have them under /etc/ceph -#ceph_rbd_mirror_remote_cluster: "" +# Even though rbd-mirror nodes should not have the admin key +# at their disposal, some people might want to have it +# distributed on rbd-mirror nodes. Setting 'copy_admin_key' to 'true' +# will copy the admin key to the /etc/ceph/ directory. Only +# valid for Luminous and later releases. +#copy_admin_key: false +# NOTE: deprecated generic local user id for pre-Luminous releases +#ceph_rbd_mirror_local_user: "admin" ################# # CONFIGURATION # @@ -37,6 +30,16 @@ dummy: #ceph_rbd_mirror_configure: false #ceph_rbd_mirror_pool: "" +# NOTE (leseb): the following variable needs the name of the remote cluster. +# The name of this cluster must be different than your local cluster simply +# because we need to have both keys and ceph.conf inside /etc/ceph. +# Thus if cluster names are identical we can not have them under /etc/ceph +#ceph_rbd_mirror_remote_cluster: "" + +# NOTE: the rbd-mirror daemon needs a user to authenticate with the +# remote cluster. By default, this key should be available under +# /etc/ceph/.client..keyring +#ceph_rbd_mirror_remote_user: "" ########## # DOCKER # diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index a0c3749d0..1d1c384f7 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -13,7 +13,7 @@ dummy: # GENERAL # ########### -#fetch_directory: fetch/ +fetch_directory: ~/ceph-ansible-keys # The 'cluster' variable determines the name of the cluster. # Changing the default value to something else means that you will @@ -154,7 +154,7 @@ dummy: # Commit 492518a2 changed variable names of rhcs installations # to not break backward compatiblity we re-declare these variables # with the content of the new variable -#ceph_rhcs: "{{ ceph_stable_rh_storage | default(false) }}" +ceph_rhcs: true # This will affect how/what repositories are enabled depending on the desired # version. The previous version was 1.3. The current version is 2. #ceph_rhcs_version: "{{ ceph_stable_rh_storage_version | default(2) }}" -- 2.39.5