diff options
| author |   Stuart Mackie <wsmackie@juniper.net> | 2017-11-13 19:07:05 -0800 |
|---|---|---|
| committer | Stuart Mackie <wsmackie@juniper.net> | 2017-11-14 03:10:38 +0000 |
| commit | 95fc8308b92849123e0994c37faec0eb4d063fa8 (patch) | |
| tree | 05e734947ca5be9b1780a82ba647bebe088a0c52 /ci/config_tpl/juju2/bundle_tpl/keystone.yaml | |
| parent | 520f921f6e3bd2ab38c385511662f7631461bd0b (diff) | |
Keystone V3, neutron-api.yaml: manage-neutron-plugin-legacy-mode: False, patch containers after launch
Change-Id: Ia434e68bc3df9812ebfb7fcaa6d02dd81f046f0b
Signed-off-by: Stuart Mackie <wsmackie@juniper.net>
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/keystone.yaml')
| -rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 2 |
1 files changed, 0 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 %} |