From: Rishabh Dave <ridave@redhat.com>
Date: Thu, 28 Mar 2019 07:45:53 +0000 (+0530)
Subject: add-osds: don't hardcode group names
X-Git-Tag: v5.0.0alpha1~441
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=192fea0fec77951f6ac8b4c4c93db67d75fc1c54;p=ceph-ansible.git

add-osds: don't hardcode group names

Instead of hardcoding group names, import ceph-defaults earlier. Also,
rectify a minor mistake in vagrant_varaibles.yml for containerized
version of add_osds.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
---

diff --git a/infrastructure-playbooks/add-osd.yml b/infrastructure-playbooks/add-osd.yml
index 1c2d3e27d..31861930c 100644
--- a/infrastructure-playbooks/add-osd.yml
+++ b/infrastructure-playbooks/add-osd.yml
@@ -31,21 +31,21 @@
       when:
         - not delegate_facts_host | bool
 
+    - import_role:
+        name: ceph-defaults
+
     - name: gather and delegate facts
       setup:
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items:
-        - "{{ groups['mons'] }}"
-        - "{{ groups['osds'] }}"
+        - "{{ groups[mon_group_name] }}"
+        - "{{ groups[osd_group_name] }}"
       run_once: True
       when:
         - delegate_facts_host | bool
 
   tasks:
-    - import_role:
-        name: ceph-defaults
-
     - import_role:
         name: ceph-facts
 
@@ -66,13 +66,16 @@
       when:
         - not delegate_facts_host | bool
 
+    - import_role:
+        name: ceph-defaults
+
     - name: gather and delegate facts
       setup:
       delegate_to: "{{ item }}"
       delegate_facts: True
       with_items:
-        - "{{ groups['mons'] }}"
-        - "{{ groups['osds'] }}"
+        - "{{ groups[mon_group_name] }}"
+        - "{{ groups[osd_group_name] }}"
       run_once: True
       when:
         - delegate_facts_host | bool
@@ -89,9 +92,6 @@
       changed_when: False
 
   tasks:
-    - import_role:
-        name: ceph-defaults
-
     - import_role:
         name: ceph-facts
 
diff --git a/tests/functional/add-osds/container/vagrant_variables.yml b/tests/functional/add-osds/container/vagrant_variables.yml
index c0bf4174f..b151ccc2a 100644
--- a/tests/functional/add-osds/container/vagrant_variables.yml
+++ b/tests/functional/add-osds/container/vagrant_variables.yml
@@ -1,7 +1,7 @@
 ---
 
 # DEPLOY CONTAINERIZED DAEMONS
-docker: false
+docker: true
 
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1