Merge "Replace openstack.org git:// URLs with https://"
diff --git a/devstack/customize_image.sh b/devstack/customize_image.sh
index 669c761..77ff699 100644
--- a/devstack/customize_image.sh
+++ b/devstack/customize_image.sh
@@ -9,7 +9,7 @@
# By default enable guest image customization. It will be automatically skipped
# for cirros images
-CUSTOMIZE_IMAGE=${CUSTOMIZE_IMAGE:-True}
+CUSTOMIZE_IMAGE=${CUSTOMIZE_IMAGE:-False}
# Image customization is performed using virt-customize
# using direct backend by default
diff --git a/neutron_tempest_plugin/api/admin/test_ports.py b/neutron_tempest_plugin/api/admin/test_ports.py
index 642e910..63fb611 100644
--- a/neutron_tempest_plugin/api/admin/test_ports.py
+++ b/neutron_tempest_plugin/api/admin/test_ports.py
@@ -150,14 +150,6 @@
port = self.admin_client.show_port(port_id)['port']
self.assertIsNone(port['resource_request'])
- @decorators.idempotent_id('10b3308b-d8a2-459b-9b89-a146863c357f')
- def test_port_resource_request_no_provider_net(self):
- port = self._create_qos_policy_and_port(
- network=self.network, vnic_type=self.vnic_type)
-
- self.assertIn('resource_request', port)
- self.assertIsNone(port['resource_request'])
-
@decorators.idempotent_id('0eeb6ffa-9a7a-40b5-83dd-dbdcd67e2e64')
def test_port_resource_request_empty(self):
qos_policy = self.create_qos_policy(
diff --git a/neutron_tempest_plugin/scenario/test_migration.py b/neutron_tempest_plugin/scenario/test_migration.py
index 3d6c1dd..f4b918c 100644
--- a/neutron_tempest_plugin/scenario/test_migration.py
+++ b/neutron_tempest_plugin/scenario/test_migration.py
@@ -173,13 +173,11 @@
class NetworkMigrationFromHA(NetworkMigrationTestBase):
- @common_utils.unstable_test("bug 1789434")
@decorators.idempotent_id('b4e68ac0-3b76-4306-ae8a-51cf4d363b22')
def test_from_ha_to_legacy(self):
self._test_migration(before_dvr=False, before_ha=True,
after_dvr=False, after_ha=False)
- @common_utils.unstable_test("bug 1789434")
@decorators.idempotent_id('42260eea-5d56-4d30-b62a-a62694dfe4d5')
@testtools.skipUnless(
CONF.neutron_plugin_options.l3_agent_mode == 'dvr_snat',
@@ -188,7 +186,6 @@
self._test_migration(before_dvr=False, before_ha=True,
after_dvr=True, after_ha=False)
- @common_utils.unstable_test("bug 1789434")
@decorators.idempotent_id('e4149576-248b-43fa-9d0b-a5c2f51967ce')
@testtools.skipUnless(
CONF.neutron_plugin_options.l3_agent_mode == 'dvr_snat',