Merge "Require missing dhcp-agent package"
diff --git a/README.rst b/README.rst
index d51c7b5..7e63a20 100644
--- a/README.rst
+++ b/README.rst
@@ -922,6 +922,7 @@
user: admin
password: admin
ovsdb_connection: tcp:127.0.0.1:6639
+ ovsdb_interface: native
enable_websocket: true
enable_dhcp_service: false
mechanism:
@@ -938,6 +939,7 @@
backend:
router: odl-router_v2
ovsdb_connection: tcp:127.0.0.1:6639
+ ovsdb_interface: native
opendaylight:
ovsdb_server_iface: ptcp:6639:127.0.0.1
ovsdb_odl_iface: tcp:10.20.0.77:6640
diff --git a/neutron/files/pike/neutron-generic.conf.Debian b/neutron/files/pike/neutron-generic.conf.Debian
index fe9feae..57cedea 100644
--- a/neutron/files/pike/neutron-generic.conf.Debian
+++ b/neutron/files/pike/neutron-generic.conf.Debian
@@ -2096,7 +2096,10 @@
# cipher list format. (string value)
#ciphers = <None>
-{%- if neutron.backend.ovsdb_connection is defined %}
[ovs]
+{%- if neutron.backend.ovsdb_interface is defined %}
+ovsdb_interface = {{ neutron.backend.ovsdb_interface }}
+{%- endif %}
+{%- if neutron.backend.ovsdb_connection is defined %}
ovsdb_connection = {{ neutron.backend.ovsdb_connection }}
{%- endif %}
diff --git a/neutron/files/pike/neutron-server.conf.Debian b/neutron/files/pike/neutron-server.conf.Debian
index 63e377b..7118277 100644
--- a/neutron/files/pike/neutron-server.conf.Debian
+++ b/neutron/files/pike/neutron-server.conf.Debian
@@ -2277,7 +2277,10 @@
auth_url=http://{{ server.identity.host }}:35357
{%- endif %}
-{%- if server.backend.ovsdb_connection is defined %}
[ovs]
+{%- if server.backend.ovsdb_interface is defined %}
+ovsdb_interface = {{ server.backend.ovsdb_interface }}
+{%- endif %}
+{%- if server.backend.ovsdb_connection is defined %}
ovsdb_connection = {{ server.backend.ovsdb_connection }}
{%- endif %}
diff --git a/neutron/files/queens/neutron-generic.conf.Debian b/neutron/files/queens/neutron-generic.conf.Debian
index 9c985a5..9b8c819 100644
--- a/neutron/files/queens/neutron-generic.conf.Debian
+++ b/neutron/files/queens/neutron-generic.conf.Debian
@@ -501,7 +501,10 @@
[ssl]
{%- include "oslo_templates/files/queens/oslo/service/_ssl.conf" %}
-{%- if neutron.backend.ovsdb_connection is defined %}
[ovs]
+{%- if neutron.backend.ovsdb_interface is defined %}
+ovsdb_interface = {{ neutron.backend.ovsdb_interface }}
+{%- endif %}
+{%- if neutron.backend.ovsdb_connection is defined %}
ovsdb_connection = {{ neutron.backend.ovsdb_connection }}
{%- endif %}
diff --git a/neutron/files/queens/neutron-server.conf.Debian b/neutron/files/queens/neutron-server.conf.Debian
index e68d3a9..bf4cddc 100644
--- a/neutron/files/queens/neutron-server.conf.Debian
+++ b/neutron/files/queens/neutron-server.conf.Debian
@@ -533,8 +533,11 @@
[ssl]
{%- include "oslo_templates/files/queens/oslo/service/_ssl.conf" %}
-{%- if server.backend.ovsdb_connection is defined %}
[ovs]
+{%- if server.backend.ovsdb_interface is defined %}
+ovsdb_interface = {{ server.backend.ovsdb_interface }}
+{%- endif %}
+{%- if server.backend.ovsdb_connection is defined %}
ovsdb_connection = {{ server.backend.ovsdb_connection }}
{%- endif %}
diff --git a/tests/pillar/control_opendaylight.sls b/tests/pillar/control_opendaylight.sls
index 9064406..76a4c90 100644
--- a/tests/pillar/control_opendaylight.sls
+++ b/tests/pillar/control_opendaylight.sls
@@ -56,6 +56,7 @@
user: admin
password: admin
ovsdb_connection: tcp:127.0.0.1:6639
+ ovsdb_interface: native
mechanism:
ovs:
driver: opendaylight
diff --git a/tests/pillar/gateway_legacy_opendaylight.sls b/tests/pillar/gateway_legacy_opendaylight.sls
index 8bf6b26..2f43676 100644
--- a/tests/pillar/gateway_legacy_opendaylight.sls
+++ b/tests/pillar/gateway_legacy_opendaylight.sls
@@ -6,6 +6,7 @@
tenant_network_types: "flat,vxlan"
router: odl-router
ovsdb_connection: tcp:127.0.0.1:6639
+ ovsdb_interface: native
mechanism:
ovs:
driver: opendaylight