commit 76114d69f6601293b3025cf5e84b5fcde55e4e8a
author Zuul <zuul@review.openstack.org> Tue Mar 26 22:12:07 2019 +0000
committer Gerrit Code Review <review@openstack.org> Tue Mar 26 22:12:07 2019 +0000
tree 139a1c83c87308eb2f9e2854d7856cfa23843ab6
parent 42d92e2322c6aa9dd4dad6f87efeec5300525c6b
parent 92fbbab347f4ea254f976e8dd68f1c06c1cfee59

Merge "Min bw rule operations should be rejected on non-physnet ports/networks"

.zuul.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 36c3893..7b886da 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -82,8 +82,8 @@
         TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
         NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_tempest) | join(',') }}"
       devstack_plugins:
-        neutron: git://git.openstack.org/openstack/neutron.git
-        neutron-tempest-plugin: git://git.openstack.org/openstack/neutron-tempest-plugin.git
+        neutron: https://git.openstack.org/openstack/neutron.git
+        neutron-tempest-plugin: https://git.openstack.org/openstack/neutron-tempest-plugin.git
       devstack_services:
         tls-proxy: false
         tempest: true
@@ -418,8 +418,8 @@
         ADVANCED_INSTANCE_USER: ubuntu
         BUILD_TIMEOUT: 784
       devstack_plugins:
-        neutron: git://git.openstack.org/openstack/neutron.git
-        neutron-tempest-plugin: git://git.openstack.org/openstack/neutron-tempest-plugin.git
+        neutron: https://git.openstack.org/openstack/neutron.git
+        neutron-tempest-plugin: https://git.openstack.org/openstack/neutron-tempest-plugin.git
       devstack_services:
         tls-proxy: false
         tempest: true
@@ -552,7 +552,7 @@
         # empty
         ADVANCED_IMAGE_NAME: ""
       devstack_plugins:
-        designate: git://git.openstack.org/openstack/designate.git
+        designate: https://git.openstack.org/openstack/designate.git
       devstack_services:
         cinder: false
         designate: true

devstack/customize_image.sh

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