From: Andrew Schoen Date: Tue, 10 Jan 2017 22:57:58 +0000 (-0600) Subject: purge-cluster: do not include ceph-osd and ceph-common defaults for osds X-Git-Tag: v2.1.2^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70bb86a88462c275fb3854dcfd41db3f42d4dade;p=ceph-ansible.git purge-cluster: do not include ceph-osd and ceph-common defaults for osds When purging OSDs we do not need to include these defaults as nothing in the following tasks uses them. Also, it has the side effect of overwriting any variables defined in group_vars files that are relative to the inventory you are using with the default values. That behavior was causing the CI tests to fail. Signed-off-by: Andrew Schoen (cherry picked from commit dd8389cdf7651f3bb9a02dc00c65bc48a5582bfd) --- diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml index 8588462ec..b340968bf 100644 --- a/infrastructure-playbooks/purge-cluster.yml +++ b/infrastructure-playbooks/purge-cluster.yml @@ -287,8 +287,6 @@ state: absent tasks: - - include_vars: roles/ceph-common/defaults/main.yml - - include_vars: roles/ceph-osd/defaults/main.yml - include_vars: group_vars/all.yml ignore_errors: true - include_vars: group_vars/{{ osd_group_name }}.yml