Activate neutron L2 Gateway extension
Disable l2gw agent by default to prevent unwanted connection attempts to
absent hardware switch (will be emulated/enabled by test suite on demand).
Change-Id: Iaf6da1e0f73f474d6eaee2b15e7613d58b129150
Related-Prod: PROD-18748
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index a61af8a..7c01446 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -163,6 +163,8 @@
address: 127.0.0.1
identity:
protocol: https
+ l2gw:
+ enabled: true
nova:
controller:
networking: dvr
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
index 5dbb948..a61319c 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/gateway.yml
@@ -19,6 +19,10 @@
notification:
driver: messagingv2
topics: "notifications"
+ l2gw:
+ enabled: false
+ ovsdb_hosts:
+ ovsdbx: 127.0.0.1:6632
linux:
network:
interface:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 7a4889b..4ab6709 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -120,6 +120,10 @@
engine: file
images: []
workers: 1
+ neutron:
+ server:
+ l2gw:
+ enabled: true
nova:
controller:
networking: dvr
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
index 4cb8093..ae64c8f 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/gateway.yml
@@ -11,6 +11,12 @@
external_interface: ens6
interface_mtu: 9000
linux_system_codename: xenial
+ neutron:
+ gateway:
+ l2gw:
+ enabled: false
+ ovsdb_hosts:
+ ovsdbx: 127.0.0.1:6632
linux:
network:
bridge: openvswitch
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
index 1f8adb0..20d0dea 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -133,6 +133,8 @@
notification:
driver: messagingv2
topics: "notifications,${_param:stacklight_notification_topic}"
+ l2gw:
+ enabled: true
nova:
controller:
networking: dvr
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
index 028c83d..fb39eb4 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/gateway.yml
@@ -11,6 +11,12 @@
external_interface: ens6
interface_mtu: 9000
linux_system_codename: xenial
+ neutron:
+ gateway:
+ l2gw:
+ enabled: false
+ ovsdb_hosts:
+ ovsdbx: 127.0.0.1:6632
linux:
network:
bridge: openvswitch