From adf6aee6430b981fa371724367b2d1e2b80482b7 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 7 Feb 2017 14:38:02 -0600 Subject: [PATCH] purge-cluster: remove all include tasks Including variables from role defaults or files in a group_vars directory relative to the playbook is a bad practice. We don't want to do this because including these defaults at the task level overrides values that would be set in a group_vars directory relative to the inventory file, which is the correct usage if you wish to override those default values. Signed-off-by: Andrew Schoen --- infrastructure-playbooks/purge-cluster.yml | 54 ---------------------- 1 file changed, 54 deletions(-) diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 083fda996..64f564685 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -69,12 +69,6 @@ become: true tasks: - - include_vars: roles/ceph-common/defaults/main.yml - - include_vars: roles/ceph-mds/defaults/main.yml - - include_vars: group_vars/all.yml - ignore_errors: true - - include_vars: group_vars/{{ mds_group_name }}.yml - ignore_errors: true - name: stop ceph mdss with systemd service: @@ -106,12 +100,6 @@ become: true tasks: - - include_vars: roles/ceph-common/defaults/main.yml - - include_vars: roles/ceph-rgw/defaults/main.yml - - include_vars: group_vars/all.yml - ignore_errors: true - - include_vars: group_vars/{{ rgw_group_name }}.yml - ignore_errors: true - name: stop ceph rgws with systemd service: @@ -143,12 +131,6 @@ become: true tasks: - - include_vars: roles/ceph-common/defaults/main.yml - - include_vars: roles/ceph-rbd-mirror/defaults/main.yml - - include_vars: group_vars/all.yml - ignore_errors: true - - include_vars: group_vars/{{ rbdmirror_group_name }}.yml - ignore_errors: true - name: stop ceph rbd mirror with systemd service: @@ -175,12 +157,6 @@ become: true tasks: - - include_vars: roles/ceph-common/defaults/main.yml - - include_vars: roles/ceph-nfs/defaults/main.yml - - include_vars: group_vars/all.yml - ignore_errors: true - - include_vars: group_vars/{{ nfs_group_name }}.yml - ignore_errors: true - name: stop ceph nfss with systemd service: @@ -227,10 +203,6 @@ state: absent tasks: - - include_vars: group_vars/all.yml - ignore_errors: true - - include_vars: group_vars/{{ osd_group_name }}.yml - ignore_errors: true - name: check for a device list fail: @@ -395,15 +367,6 @@ become: true tasks: - - include_vars: roles/ceph-common/defaults/main.yml - - include_vars: roles/ceph-mon/defaults/main.yml - - include_vars: roles/ceph-restapi/defaults/main.yml - - include_vars: group_vars/all.yml - ignore_errors: true - - include_vars: group_vars/{{ mon_group_name }}.yml - ignore_errors: true - - include_vars: group_vars/{{ restapi_group_name }}.yml - ignore_errors: true - name: stop ceph mons with systemd service: @@ -607,23 +570,6 @@ gather_facts: false tasks: - - include_vars: roles/ceph-common/defaults/main.yml - - include_vars: group_vars/all.yml - ignore_errors: true - - include_vars: group_vars/{{ mds_group_name }}.yml - ignore_errors: true - - include_vars: group_vars/{{ rgw_group_name }}.yml - ignore_errors: true - - include_vars: group_vars/{{ rbdmirror_group_name }}.yml - ignore_errors: true - - include_vars: group_vars/{{ nfs_group_name }}.yml - ignore_errors: true - - include_vars: group_vars/{{ osd_group_name }}.yml - ignore_errors: true - - include_vars: group_vars/{{ mon_group_name }}.yml - ignore_errors: true - - include_vars: group_vars/{{ restapi_group_name }}.yml - ignore_errors: true - name: purge fetch directory for localhost file: -- 2.39.5