From 6b7147e9010a93cb9134f58a5a273953c9031d01 Mon Sep 17 00:00:00 2001
From: alextricity25 <miguel.cantu@rackspace.com>
Date: Fri, 3 Feb 2017 11:14:24 -0600
Subject: [PATCH] Move scenario variables under vars

This is so variables can be overridden in playbooks
that include bootstrap-aio.yml. Otherwise, the variables
specified at time of the role invocation will always take
precedence.

Change-Id: Ie2df5f4b18795edbc4abec1c348057106537f857
---
 tests/bootstrap-aio.yml | 78 ++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/tests/bootstrap-aio.yml b/tests/bootstrap-aio.yml
index 84cbf05b6b..f0f147493a 100644
--- a/tests/bootstrap-aio.yml
+++ b/tests/bootstrap-aio.yml
@@ -21,47 +21,47 @@
     - role: "sshd"
     - role: "pip_install"
     - role: "bootstrap-host"
-      openstack_confd_entries: "{{ confd_overrides[scenario] }}"
-      bootstrap_host_scenario: "{{ scenario }}"
-      confd_overrides:
-        aio:
-          - name: aodh.yml.aio
-          - name: cinder.yml.aio
-          - name: ceilometer.yml.aio
-          - name: designate.yml.aio
-          - name: glance.yml.aio
-          - name: gnocchi.yml.aio
-          - name: heat.yml.aio
-          - name: horizon.yml.aio
-          - name: keystone.yml.aio
-          - name: neutron.yml.aio
-          - name: nova.yml.aio
-          - name: swift.yml.aio
-        ceph:
-          - name: ceph.yml.aio
-          - name: cinder.yml.aio
-          - name: glance.yml.aio
-          - name: heat.yml.aio
-          - name: horizon.yml.aio
-          - name: keystone.yml.aio
-          - name: neutron.yml.aio
-          - name: nova.yml.aio
-        upgrade:
-          # This starts as an AIO box, then an upgrade is run
-          - name: aodh.yml.aio
-          - name: cinder.yml.aio
-          - name: ceilometer.yml.aio
-          - name: designate.yml.aio
-          - name: glance.yml.aio
-          - name: gnocchi.yml.aio
-          - name: heat.yml.aio
-          - name: horizon.yml.aio
-          - name: keystone.yml.aio
-          - name: neutron.yml.aio
-          - name: nova.yml.aio
-          - name: swift.yml.aio
   vars:
+    openstack_confd_entries: "{{ confd_overrides[scenario] }}"
+    bootstrap_host_scenario: "{{ scenario }}"
     scenario: "{{ lookup('env','SCENARIO') | default('aio', true) }}"
+    confd_overrides:
+      aio:
+        - name: aodh.yml.aio
+        - name: cinder.yml.aio
+        - name: ceilometer.yml.aio
+        - name: designate.yml.aio
+        - name: glance.yml.aio
+        - name: gnocchi.yml.aio
+        - name: heat.yml.aio
+        - name: horizon.yml.aio
+        - name: keystone.yml.aio
+        - name: neutron.yml.aio
+        - name: nova.yml.aio
+        - name: swift.yml.aio
+      ceph:
+        - name: ceph.yml.aio
+        - name: cinder.yml.aio
+        - name: glance.yml.aio
+        - name: heat.yml.aio
+        - name: horizon.yml.aio
+        - name: keystone.yml.aio
+        - name: neutron.yml.aio
+        - name: nova.yml.aio
+      upgrade:
+        # This starts as an AIO box, then an upgrade is run
+        - name: aodh.yml.aio
+        - name: cinder.yml.aio
+        - name: ceilometer.yml.aio
+        - name: designate.yml.aio
+        - name: glance.yml.aio
+        - name: gnocchi.yml.aio
+        - name: heat.yml.aio
+        - name: horizon.yml.aio
+        - name: keystone.yml.aio
+        - name: neutron.yml.aio
+        - name: nova.yml.aio
+        - name: swift.yml.aio
     sshd:
       ListenAddress:
         - 0.0.0.0