]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
purge-cluster: do not include ceph-osd and ceph-common defaults for osds
authorAndrew Schoen <aschoen@redhat.com>
Tue, 10 Jan 2017 22:57:58 +0000 (16:57 -0600)
committerAlfredo Deza <adeza@redhat.com>
Tue, 17 Jan 2017 16:43:58 +0000 (11:43 -0500)
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 <aschoen@redhat.com>
(cherry picked from commit dd8389cdf7651f3bb9a02dc00c65bc48a5582bfd)

infrastructure-playbooks/purge-cluster.yml

index 8588462ec2c3a701e96bac426f33a0168d5209cb..b340968bf505b1eb5b53c52c169fcd7f183e790e 100644 (file)
      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