Merge "Fix errors in designate scenarios jobs"
diff --git a/.zuul.yaml b/.zuul.yaml
index 2ac6c8b..e2265ab 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -791,9 +791,24 @@
DESIGNATE_BACKEND_DRIVER: bind9
DOWNLOAD_DEFAULT_IMAGES: false
IMAGE_URLS: http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-i386-disk.img,
+ Q_AGENT: openvswitch
# In this job advanced image is not needed, so it's name should be
# empty
ADVANCED_IMAGE_NAME: ""
+ devstack_local_conf:
+ post-config:
+ $NEUTRON_CONF:
+ DEFAULT:
+ enable_dvr: false
+ # NOTE(slaweq): We can get rid of this hardcoded absolute path when
+ # devstack-tempest job will be switched to use lib/neutron instead of
+ # lib/neutron-legacy
+ /$NEUTRON_CORE_PLUGIN_CONF:
+ agent:
+ tunnel_types: vxlan,gre
+ ovs:
+ tunnel_bridge: br-tun
+ bridge_mappings: public:br-ex
devstack_plugins:
designate: https://opendev.org/openstack/designate.git
devstack_services: