Merge branch 'develop'

Author: davidmnoriega

provisioning/openstack/admin-setup-tasks.yml

@@ -2,11 +2,17 @@
   - name: Configure openstack for vagrant demo environment
     hosts: vagrant
     become: false
+    vars:
+      external_gateway_octet: '1'
     tasks:
+      - set_fact:
+          external_gateway_octet: '2'
+        when: ansible_virtualization_type == 'VMware'
+
       - name: External network facts
         set_fact:
           external_cidr: "{{ ansible_br_ex.ipv4.address|ipsubnet(24)|ipaddr('net') }}"
-          external_gateway: "{{ ansible_br_ex.ipv4.address|ipsubnet(24)|ipaddr('net')|ipaddr('1')|ipv4('address') }}"
+          external_gateway: "{{ ansible_br_ex.ipv4.address|ipsubnet(24)|ipaddr('net')|ipaddr(external_gateway_octet)|ipv4('address') }}"
 
       - name: Local network facts
         set_fact:

provisioning/vagrant/packstack-install.yml

@@ -11,6 +11,9 @@
           update_cache: yes
         register: yum_upgrade
 
+      - name: Update networking before reboot
+        meta: flush_handlers
+
       - name: Reboot host
         shell: sleep 2 && shutdown -r now
         async: 1
@@ -58,7 +61,7 @@
           state: present
 
       - name: Run Packstack Installer - Please Wait
-        command: "{{ packstack_common_command + packstack_network }}"
+        command: "{{ packstack_common_command + packstack_guest_specific_args }}"
         async: 1200 # Possible this needs to be larger
         poll: 10
 

provisioning/vagrant/vars-virtualbox.yml

@@ -19,6 +19,6 @@ el_network_interfaces:
     type: ethernet
     ip4: "172.16.1.10/24"
 
-packstack_network: "--os-neutron-ovs-bridge-mappings=extnet:br-ex,localnet:br-local \
+packstack_guest_specific_args: "--os-neutron-ovs-bridge-mappings=extnet:br-ex,localnet:br-local \
   --os-neutron-ovs-bridge-interfaces=br-ex:{{ external_interface }},br-local:{{ local_interface }}"
 openstack_api_ip: "{{ ansible_enp0s8.ipv4.address }}"

provisioning/vagrant/vars-vmware.yml

@@ -9,7 +9,7 @@ el_network_interfaces:
     type: ethernet
     ip4: '{{ ansible_ens33.ipv4.address }}/24'
 
-packstack_network: "--os-neutron-ovs-bridge-mappings=extnet:br-ex \
+packstack_guest_specific_args: "--os-neutron-ovs-bridge-mappings=extnet:br-ex \
   --os-neutron-ovs-bridge-interfaces=br-ex:{{ external_interface }} \
   --os-neutron-l3-ext-bridge=br-ex"
 openstack_api_ip: "{{ ansible_ens33.ipv4.address }}"