From 7289acb6b35c7e28593f67982aa6bdb88ed6477e Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 7 Mar 2017 13:23:40 -0600 Subject: [PATCH] purge-docker-cluster: do not set group names vars at playbook level Signed-off-by: Andrew Schoen --- .../purge-docker-cluster.yml | 80 +++++-------------- 1 file changed, 18 insertions(+), 62 deletions(-) diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml index 66cb1d768..bd5469f6d 100644 --- a/infrastructure-playbooks/purge-docker-cluster.yml +++ b/infrastructure-playbooks/purge-docker-cluster.yml @@ -46,11 +46,8 @@ - name: purge ceph mds cluster - vars: - mds_group_name: mdss - hosts: - - "{{ mds_group_name }}" + - "{{ mds_group_name|default('mdss') }}" become: true @@ -93,11 +90,8 @@ - name: purge ceph rgw cluster - vars: - rgw_group_name: rgws - hosts: - - "{{ rgw_group_name }}" + - "{{ rgw_group_name|default('rgws') }}" become: true @@ -140,11 +134,8 @@ - name: purge ceph rbd-mirror cluster - vars: - rbdmirror_group_name: rbd-mirrors - hosts: - - "{{ rbdmirror_group_name }}" + - "{{ rbdmirror_group_name|default('rbdmirrors') }}" become: true @@ -187,11 +178,8 @@ - name: purge ceph nfs cluster - vars: - nfs_group_name: nfss - hosts: - - "{{ nfs_group_name }}" + - "{{ nfs_group_name|default('nfss') }}" become: true @@ -243,11 +231,8 @@ - name: purge ceph osd cluster - vars: - osd_group_name: osds - hosts: - - "{{ osd_group_name }}" + - "{{ osd_group_name|default('osds') }}" become: true @@ -331,12 +316,8 @@ - name: purge ceph mon cluster - vars: - mon_group_name: mons - restapi_group_name: restapis - hosts: - - "{{ mon_group_name }}" + - "{{ mon_group_name|default('mons') }}" become: true @@ -389,21 +370,13 @@ - name: remove installed packages - 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 - hosts: - - "{{ mon_group_name }}" - - "{{ osd_group_name }}" - - "{{ mds_group_name }}" - - "{{ rgw_group_name }}" - - "{{ rbdmirror_group_name }}" - - "{{ nfs_group_name }}" + - "{{ mon_group_name|default('mons') }}" + - "{{ osd_group_name|default('osds') }}" + - "{{ mds_group_name|default('mdss') }}" + - "{{ rgw_group_name|default('rgws') }}" + - "{{ rbdmirror_group_name|default('rbdmirrors') }}" + - "{{ nfs_group_name|default('nfss') }}" become: true @@ -559,21 +532,13 @@ - name: purge ceph directories - 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 - hosts: - - "{{ mon_group_name }}" - - "{{ osd_group_name }}" - - "{{ mds_group_name }}" - - "{{ rgw_group_name }}" - - "{{ rbdmirror_group_name }}" - - "{{ nfs_group_name }}" + - "{{ mon_group_name|default('mons') }}" + - "{{ osd_group_name|default('osds') }}" + - "{{ mds_group_name|default('mdss') }}" + - "{{ rgw_group_name|default('rgws') }}" + - "{{ rbdmirror_group_name|default('rbdmirrors') }}" + - "{{ nfs_group_name|default('nfss') }}" gather_facts: false # Already gathered previously @@ -592,15 +557,6 @@ - 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