modified to enable the DVR on the deployment by default.

[joid.git] / ci / config_tpl / juju2 / bundle_tpl / neutron-api.yaml

diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
index 823e251..f6daca5 100644 (file)
--- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
+++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml
@@ -15,7 +15,7 @@
         openstack-origin-git: "{{ os.git_repo.branch }}"
 {% endif %}
         region: *openstack-region
-        neutron-security-groups: true
+        neutron-security-groups: True
         worker-multiplier: *worker-multiplier
 {% if os.network.ipv6 %}
         prefer-ipv6: {{ os.network.ipv6 }}
@@ -27,8 +27,11 @@
         flat-network-providers: physnet1
 {% if os.network.dvr %}
         overlay-network-type: vxlan
+        enable-dvr: True
+        l2-population: True
+        enable-l3ha: True
 {% else %}
-        overlay-network-type: vxlan gre
+        overlay-network-type: vxlan
         default-tenant-network-type: vxlan
 {% endif %}
 {% elif os.network.controller == 'odl' %}
@@ -41,9 +44,6 @@
         flat-network-providers: physnet1
         manage-neutron-plugin-legacy-mode: False
 {% endif %}
-{% if os.network.dvr %}
-        enable-dvr: true
-{% endif %}
 {% if os.network.l2_population %}
         l2-population: true
 {% endif %}