From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 16 Jul 2019 15:29:40 +0000 (-0500)
Subject: ceph-volume: fix deploy playbook for ansible~=2.6,<2.7
X-Git-Tag: v12.2.13~185^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b619988fbfafa7568e0ec51cfb56336a72460d44;p=ceph.git

ceph-volume: fix deploy playbook for ansible~=2.6,<2.7

When testing the lumionus and mimic branch the import_role
ansible feature does not work as expected. Variables created by one
role is not available to the next role called when using
import_role. To fix this, we need to use the roles keyword instead.

This commit is only applies to luminous and mimic and should
only be applied there.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
index b334968a5a926..a6aea8b51228e 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/playbooks/deploy.yml
@@ -72,11 +72,9 @@
       set_fact:
         is_atomic: '{{ stat_ostree.stat.exists }}'
 
-  tasks:
-    - import_role:
-        name: ceph-defaults
-    - import_role:
-        name: ceph-validate
+  roles:
+    - ceph-defaults
+    - ceph-validate
 
 - hosts:
   - mons
@@ -85,15 +83,13 @@
   gather_facts: false
   become: True
   any_errors_fatal: true
+  roles:
+    - ceph-defaults
+    - ceph-facts
+    - ceph-handler
+    - ceph-common
+
   tasks:
-    - import_role:
-        name: ceph-defaults
-    - import_role:
-        name: ceph-facts
-    - import_role:
-        name: ceph-handler
-    - import_role:
-        name: ceph-common
 
     - name: rsync ceph-volume to test nodes on centos
       synchronize: