]> 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 1221/head
authorAndrew Schoen <aschoen@redhat.com>
Tue, 10 Jan 2017 22:57:58 +0000 (16:57 -0600)
committerAndrew Schoen <aschoen@redhat.com>
Tue, 10 Jan 2017 22:57:58 +0000 (16:57 -0600)
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>
infrastructure-playbooks/purge-cluster.yml

index 84a8c83cd49ebe17e04c18a58eab9278d3cb2616..83fad3016aa325e89badcc70ae41e1c557a96ab1 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