diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-11-21 22:43:36 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-11-21 23:12:20 -0600 |
| commit | 01e331239780afb41557f5436238b438865bcafb (patch) | |
| tree | 24fa5780214668d24554a6f25dc5f408f56dfea6 /ci/config_tpl | |
| parent | ab10f090847a88679bd5fd9597aae388f01f7e2e (diff) | |
add pod19 without vlan.
Change-Id: I0764f19e0389921a7240802ebce0c484837f19ee
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 2 | ||||
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml index 233d1d72..1c6b78f6 100644 --- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml @@ -17,9 +17,7 @@ region: *openstack-region admin-role: {{ os.admin.role }} keystone-admin-role: {{ os.admin.role }} -{% if os.network.controller != 'ocl' %} preferred-api-version: 3 -{% endif %} {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} diff --git a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml index e59530c1..823e251a 100644 --- a/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/neutron-api.yaml @@ -37,6 +37,9 @@ {% elif os.network.controller == 'onos' %} flat-network-providers: physnet1 manage-neutron-plugin-legacy-mode: False +{% elif os.network.controller == 'ocl' %} + flat-network-providers: physnet1 + manage-neutron-plugin-legacy-mode: False {% endif %} {% if os.network.dvr %} enable-dvr: true |