Fix integration testing

The current setup breaks external connectivity for the test instance.
In order to avoid this, do not set the
external_network_bridge_interface. This will default to the external
network being set up on eth1.

After that, installation is still failing, add removing pre-installed
libvirt as a workaround for [0].

[0] https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1499199

Change-Id: If4dfaaa0a6aa089e395be6979d1b06cc70132645

Berksfile

@@ -4,7 +4,7 @@ source 'https://supermarket.chef.io'
    dashboard database data-processing identity image
    integration-test network object-storage ops-database
    ops-messaging orchestration telemetry}.each do |cookbook|
-  if ENV['REPO_DEV'] && Dir.exist?("../cookbook-openstack-#{cookbook}")
+  if ENV['ZUUL_CHANGES'] && Dir.exist?("../cookbook-openstack-#{cookbook}")
     cookbook "openstack-#{cookbook}", path: "../cookbook-openstack-#{cookbook}"
   else
     cookbook "openstack-#{cookbook}", github: "openstack/cookbook-openstack-#{cookbook}"

Rakefile

@@ -103,6 +103,7 @@ end
 def _run_basic_queries # rubocop:disable Metrics/MethodLength
   _run_commands('basic test queries', {
     'curl' => ['-v http://localhost', '-kv https://localhost'],
+    'sudo netstat' => ['-nlp'],
     'nova-manage' => ['version', 'db version'],
     'nova' => %w(--version service-list hypervisor-list net-list image-list),
     'glance-manage' => %w(db_version),
@@ -153,11 +154,14 @@ task :integration => [:create_key, :berks_vendor] do
   sh %(sudo mkdir /etc/chef && sudo cp .chef/encrypted_data_bag_secret /etc/chef/openstack_data_bag_secret)
   _run_env_queries
 
+  # Workaround for https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1499199
+  sh %(sudo apt-get purge -y libvirt0)
+
   # Three passes to make sure of cookbooks idempotency
   for i in 1..3
     puts "####### Pass #{i}"
     # Kick off chef client in local mode, will converge OpenStack right on the gate job "in place"
-    sh %(sudo chef-client --force-formatter -z -E integration-aio-neutron -r 'role[allinone-compute]','role[os-image-upload]','recipe[openstack-integration-test::setup]')
+    sh %(sudo chef-client --force-logger -z -E integration-aio-neutron -r 'role[allinone-compute]','role[os-image-upload]','recipe[openstack-integration-test::setup]')
     _setup_local_network if i == 1
     _run_basic_queries
     _setup_cinder_volume

environments/integration-aio-neutron.json

@@ -15,9 +15,6 @@
             "network": {
                 "dhcp": {
                     "enable_isolated_metadata": "True"
-                },
-                "l3":{
-                    "external_network_bridge_interface": "eth0"
                 }
             },
             "block-storage": {