diff options
author | 2018-01-22 18:36:29 -0600 | |
---|---|---|
committer | 2018-01-22 18:36:56 -0600 | |
commit | aadc493bf402476ae10f526403591f9f21d8e715 (patch) | |
tree | 506227c6e4118ef0dd2d4916814d351f73345f22 /ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | |
parent | 69bb3846048a7c05ddb96364c4881da5e4f1b62d (diff) |
modified to enable the DVR on the deployment by default.
Change-Id: Iea20b4071a6d8f67db4c190e509ef71f0a70358a
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml')
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml index 823e251a..f6daca52 100644 --- 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 %} |