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

@@ -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

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"