From 315ab08b1604e655eee4b493eb2c1171a67df506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 6 Jun 2018 14:41:46 +0800 Subject: [PATCH] contrib: fix generate group_vars samples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For ceph-iscsi-gw and ceph-rbd-mirror roles the group_name are named differently (by default) than the role name so we have to change the script to generate the correct name. Signed-off-by: Sébastien Han --- generate_group_vars_sample.sh | 4 ++++ group_vars/{iscsi-gws.yml.sample => iscsigws.yml.sample} | 2 +- group_vars/{rbd-mirrors.yml.sample => rbdmirrors.yml.sample} | 0 3 files changed, 5 insertions(+), 1 deletion(-) rename group_vars/{iscsi-gws.yml.sample => iscsigws.yml.sample} (99%) rename group_vars/{rbd-mirrors.yml.sample => rbdmirrors.yml.sample} (100%) diff --git a/generate_group_vars_sample.sh b/generate_group_vars_sample.sh index de8264ff6..6808d23c6 100755 --- a/generate_group_vars_sample.sh +++ b/generate_group_vars_sample.sh @@ -66,6 +66,10 @@ for role in "$basedir"/roles/ceph-*; do output="agent.yml.sample" elif [[ $rolename == "ceph-fetch-keys" ]]; then output="ceph-fetch-keys.yml.sample" + elif [[ $rolename == "ceph-rbd-mirror" ]]; then + output="rbdmirrors.yml.sample" + elif [[ $rolename == "ceph-iscsi-gw" ]]; then + output="iscsigws.yml.sample" else output="${rolename:5}s.yml.sample" fi diff --git a/group_vars/iscsi-gws.yml.sample b/group_vars/iscsigws.yml.sample similarity index 99% rename from group_vars/iscsi-gws.yml.sample rename to group_vars/iscsigws.yml.sample index ff2fbac42..442432473 100644 --- a/group_vars/iscsi-gws.yml.sample +++ b/group_vars/iscsigws.yml.sample @@ -73,7 +73,7 @@ dummy: #api_password: admin #api_port: 5001 #api_secure: false -#loop_delay: .5 +#loop_delay: 1 #trusted_ip_list: 192.168.122.1 diff --git a/group_vars/rbd-mirrors.yml.sample b/group_vars/rbdmirrors.yml.sample similarity index 100% rename from group_vars/rbd-mirrors.yml.sample rename to group_vars/rbdmirrors.yml.sample