From 645b5efebf413831c5879cd6222f927045ba9ac0 Mon Sep 17 00:00:00 2001 From: Eduard Egorov Date: Tue, 1 Nov 2016 11:39:21 +0000 Subject: [PATCH] Fix hard-coded host group names in include tasks for group variables' file paths. Signed-off-by: Eduard Egorov --- infrastructure-playbooks/purge-cluster.yml | 42 ++++++++++++------- .../purge-docker-cluster.yml | 40 +++++++++++------- infrastructure-playbooks/rolling_update.yml | 15 +++---- ...inerized-to-containerized-ceph-daemons.yml | 17 ++++---- 4 files changed, 68 insertions(+), 46 deletions(-) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index ac1e89ee1..68a530298 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -75,7 +75,7 @@ - include_vars: roles/ceph-mds/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/mdss + - include_vars: group_vars/{{ mds_group_name }} failed_when: false - name: stop ceph.target with systemd @@ -126,7 +126,7 @@ - include_vars: roles/ceph-rgw/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/rgws + - include_vars: group_vars/{{ rgw_group_name }} failed_when: false - name: stop ceph.target with systemd @@ -177,7 +177,7 @@ - include_vars: roles/ceph-rbd-mirror/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/rbd-mirrors + - include_vars: group_vars/{{ rbdmirror_group_name }} failed_when: false - name: stop ceph.target with systemd @@ -222,7 +222,7 @@ - include_vars: roles/ceph-nfs/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/nfss + - include_vars: group_vars/{{ nfs_group_name }} failed_when: false - name: stop ceph.target with systemd @@ -291,12 +291,12 @@ - include_vars: roles/ceph-osd/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/osds + - include_vars: group_vars/{{ osd_group_name }} failed_when: false - name: check for a device list fail: - msg: "OSD automatic discovery was detected, purge cluster does not support this scenario. If you want to purge the cluster, manually provide the list of devices in group_vars/osds using the devices variable." + msg: "OSD automatic discovery was detected, purge cluster does not support this scenario. If you want to purge the cluster, manually provide the list of devices in group_vars/{{ osd_group_name }} using the devices variable." when: devices is not defined and osd_auto_discovery @@ -429,7 +429,8 @@ - name: purge ceph mon cluster vars: - mon_group_name: mons + mon_group_name: mons + restapi_group_name: restapis hosts: - "{{ mon_group_name }}" @@ -444,9 +445,9 @@ - include_vars: roles/ceph-restapi/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/mons + - include_vars: group_vars/{{ mon_group_name }} failed_when: false - - include_vars: group_vars/restapis + - include_vars: group_vars/{{ restapi_group_name }} failed_when: false - name: stop ceph.target with systemd @@ -652,6 +653,15 @@ - name: purge fetch directory + vars: + mon_group_name: mons + osd_group_name: osds + mds_group_name: mdss + rgw_group_name: rgws + rbdmirror_group_name: rbdmirrors + nfs_group_name: nfss + restapi_group_name: restapis + hosts: - localhost @@ -661,19 +671,19 @@ - include_vars: roles/ceph-common/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/mdss + - include_vars: group_vars/{{ mds_group_name }} failed_when: false - - include_vars: group_vars/rgws + - include_vars: group_vars/{{ rgw_group_name }} failed_when: false - - include_vars: group_vars/rbd-mirrors + - include_vars: group_vars/{{ rbdmirror_group_name }} failed_when: false - - include_vars: group_vars/nfss + - include_vars: group_vars/{{ nfs_group_name }} failed_when: false - - include_vars: group_vars/osds + - include_vars: group_vars/{{ osd_group_name }} failed_when: false - - include_vars: group_vars/mons + - include_vars: group_vars/{{ mon_group_name }} failed_when: false - - include_vars: group_vars/restapis + - include_vars: group_vars/{{ restapi_group_name }} failed_when: false - name: purge fetch directory for localhost diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml index 1a53c1a46..ce2c9f23d 100644 --- a/infrastructure-playbooks/purge-docker-cluster.yml +++ b/infrastructure-playbooks/purge-docker-cluster.yml @@ -59,7 +59,7 @@ - include_vars: roles/ceph-mds/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/mdss + - include_vars: group_vars/{{ mds_group_name }} failed_when: false - name: disable ceph mds service @@ -105,7 +105,7 @@ - include_vars: roles/ceph-rgw/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/rgws + - include_vars: group_vars/{{ rgw_group_name }} failed_when: false - name: disable ceph rgw service @@ -151,7 +151,7 @@ - include_vars: roles/ceph-rbd-mirror/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/rbd-mirrors + - include_vars: group_vars/{{ rbdmirror_group_name }} failed_when: false - name: disable ceph rbd-mirror service @@ -197,7 +197,7 @@ - include_vars: roles/ceph-nfs/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/nfss + - include_vars: group_vars/{{ nfs_group_name }} failed_when: false - name: disable ceph nfs service @@ -252,7 +252,7 @@ - include_vars: roles/ceph-osd/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/osds + - include_vars: group_vars/{{ osd_group_name }} failed_when: false - name: disable ceph osd service @@ -335,7 +335,8 @@ - name: purge ceph mon cluster vars: - mon_group_name: mons + mon_group_name: mons + restapi_group_name: restapis hosts: - "{{ mon_group_name }}" @@ -348,9 +349,9 @@ - include_vars: roles/ceph-restapi/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/mons + - include_vars: group_vars/{{ mon_group_name }} failed_when: false - - include_vars: group_vars/restapis + - include_vars: group_vars/{{ restapi_group_name }} failed_when: false - name: disable ceph mon service @@ -593,6 +594,15 @@ - name: purge fetch directory + vars: + mon_group_name: mons + osd_group_name: osds + mds_group_name: mdss + rgw_group_name: rgws + rbdmirror_group_name: rbd-mirrors + nfs_group_name: nfss + restapi_group_name: restapis + hosts: - localhost @@ -602,19 +612,19 @@ - include_vars: roles/ceph-common/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/mdss + - include_vars: group_vars/{{ mds_group_name }} failed_when: false - - include_vars: group_vars/rgws + - include_vars: group_vars/{{ rgw_group_name }} failed_when: false - - include_vars: group_vars/rbd-mirrors + - include_vars: group_vars/{{ rbdmirror_group_name }} failed_when: false - - include_vars: group_vars/nfss + - include_vars: group_vars/{{ nfs_group_name }} failed_when: false - - include_vars: group_vars/osds + - include_vars: group_vars/{{ osd_group_name }} failed_when: false - - include_vars: group_vars/mons + - include_vars: group_vars/{{ mon_group_name }} failed_when: false - - include_vars: group_vars/restapis + - include_vars: group_vars/{{ restapi_group_name }} failed_when: false - name: purge fetch directory for localhost diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml index 7b5eb1df1..0c232abe9 100644 --- a/infrastructure-playbooks/rolling_update.yml +++ b/infrastructure-playbooks/rolling_update.yml @@ -63,7 +63,8 @@ - name: upgrade ceph mon cluster vars: - mon_group_name: mons + mon_group_name: mons + restapi_group_name: restapis health_mon_check_retries: 5 health_mon_check_delay: 10 @@ -83,9 +84,9 @@ - include_vars: roles/ceph-restapi/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/mons + - include_vars: group_vars/{{ mon_group_name }} failed_when: false - - include_vars: group_vars/restapis + - include_vars: group_vars/{{ restapi_group_name }} failed_when: false - name: restart ceph mons with upstart @@ -141,7 +142,7 @@ - include_vars: roles/ceph-osd/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/osds + - include_vars: group_vars/{{ osd_group_name }} failed_when: false - name: set osd flags @@ -161,7 +162,7 @@ - include_vars: roles/ceph-osd/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/osds + - include_vars: group_vars/{{ osd_group_name }} failed_when: false - name: get osd numbers @@ -227,7 +228,7 @@ - include_vars: roles/ceph-mds/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/mdss + - include_vars: group_vars/{{ mds_group_name }} failed_when: false - name: restart ceph mdss with upstart @@ -272,7 +273,7 @@ - include_vars: roles/ceph-rgw/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/rgws + - include_vars: group_vars/{{ rgw_group_name }} failed_when: false - name: restart ceph rgws with systemd diff --git a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml index 4bd4abff9..698fc9ae7 100644 --- a/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml +++ b/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml @@ -93,7 +93,8 @@ - name: switching from non-containerized to containerized ceph mon vars: - mon_group_name: mons + mon_group_name: mons + restapi_group_name: restapis hosts: - "{{ mon_group_name }}" @@ -107,9 +108,9 @@ - include_vars: roles/ceph-restapi/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/mons + - include_vars: group_vars/{{ mon_group_name }} failed_when: false - - include_vars: group_vars/restapis + - include_vars: group_vars/{{ restapi_group_name }} failed_when: false - name: select a running monitor @@ -196,7 +197,7 @@ - include_vars: roles/ceph-osd/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/osds + - include_vars: group_vars/{{ osd_group_name }} failed_when: false - name: collect osd ids @@ -301,7 +302,7 @@ - include_vars: roles/ceph-mds/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/mdss + - include_vars: group_vars/{{ mds_group_name }} failed_when: false - name: stop ceph mds service @@ -361,7 +362,7 @@ - include_vars: roles/ceph-rgw/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/rgws + - include_vars: group_vars/{{ rgw_group_name }} failed_when: false - name: stop ceph rgw service @@ -422,7 +423,7 @@ - include_vars: roles/ceph-rbd-mirror/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/rbd-mirrors + - include_vars: group_vars/{{ rbdmirror_group_name }} failed_when: false - name: stop ceph rbd mirror service @@ -481,7 +482,7 @@ - include_vars: roles/ceph-nfs/defaults/main.yml - include_vars: group_vars/all failed_when: false - - include_vars: group_vars/nfss + - include_vars: group_vars/{{ nfs_group_name }} failed_when: false - name: stop ceph nfs service -- 2.39.5