From 17b6bc6ef19e337510185e3f998fa900ce98fae8 Mon Sep 17 00:00:00 2001
From: akrzos <akrzos@redhat.com>
Date: Tue, 17 Oct 2017 15:43:24 -0400
Subject: [PATCH] Reorder browbeat venv until after git clone

All virtual environments are now inside the browbeat directory thus the
virtual environment needs to be created after git cloning browbeat.
Also remove excessive image dictionary whitespace.

Change-Id: I0b93578301b14efa58c2d11c52b371c0f5fe6798
---
 ansible/install/group_vars/all.yml            | 20 +++++++++----------
 ansible/install/roles/browbeat/tasks/main.yml | 18 ++++++++---------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ansible/install/group_vars/all.yml b/ansible/install/group_vars/all.yml
index dcfba65ab..eac388d78 100644
--- a/ansible/install/group_vars/all.yml
+++ b/ansible/install/group_vars/all.yml
@@ -86,16 +86,16 @@ browbeat_workloads:
 # Note hash key name must match intended name for image upload to
 # work consistently (Ex. images['cirros'].name == 'cirros')
 browbeat_guest_images:
-                  centos7:
-                    name: centos7
-                    url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
-                    type: qcow2
-                    convert_to_raw: false
-                  cirros:
-                    name: cirros
-                    url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
-                    type: qcow2
-                    convert_to_raw: false
+  centos7:
+    name: centos7
+    url: http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2
+    type: qcow2
+    convert_to_raw: false
+  cirros:
+    name: cirros
+    url: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+    type: qcow2
+    convert_to_raw: false
 
 # DNS Server to add
 dns_server: 8.8.8.8
diff --git a/ansible/install/roles/browbeat/tasks/main.yml b/ansible/install/roles/browbeat/tasks/main.yml
index e15dad426..7ac88a304 100644
--- a/ansible/install/roles/browbeat/tasks/main.yml
+++ b/ansible/install/roles/browbeat/tasks/main.yml
@@ -40,15 +40,6 @@
     - virtualenv
     - setuptools
 
-- name: Create browbeat virtualenv
-  command: virtualenv {{ browbeat_venv }} creates={{ browbeat_venv }}
-
-- name: Setup browbeat-venv CA certificate path
-  lineinfile:
-    dest: "{{ browbeat_venv }}/bin/activate"
-    line: 'export REQUESTS_CA_BUNDLE={{ overcloud_ca_path }}'
-  when: overcloud_ca_path is defined
-
 - name: Determine if browbeat directory exists already
   stat:
     path: "{{ browbeat_path }}"
@@ -64,6 +55,15 @@
     version: master
   when: browbeat_exists.stat.isdir is undefined
 
+- name: Create browbeat virtualenv
+  command: virtualenv {{ browbeat_venv }} creates={{ browbeat_venv }}
+
+- name: Setup browbeat-venv CA certificate path
+  lineinfile:
+    dest: "{{ browbeat_venv }}/bin/activate"
+    line: 'export REQUESTS_CA_BUNDLE={{ overcloud_ca_path }}'
+  when: overcloud_ca_path is defined
+
 - name: Determine if generate_tripleo_hostfile has been run
   stat:
     path: "{{ browbeat_path }}/ansible/hosts"