diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2016-12-21 12:24:09 -0600 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-12-21 12:28:47 -0600 |
commit | d34b7dfbcee799533c25735db0e8aa47f433c0c7 (patch) | |
tree | 6eb5dc4ab98ef3ebf0c008dd31b26410a6790445 /ci/config_tpl/juju2/bundle_tpl/keystone.yaml | |
parent | 735846bdb8e4623c24fc045a79ce82389fdff70c (diff) |
modfiied to have space support in the juju2 configuration.
Change-Id: I2ccdee8604ef41ef79bb76eb9a165b1c02147d10
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/keystone.yaml')
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/keystone.yaml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml index 65c1f76c..bbb23584 100644 --- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml @@ -1,11 +1,24 @@ keystone: charm: "./{{ ubuntu.release }}/keystone" num_units: {{ unit_qty() }} + bindings: + internal: internal +{% if opnfv.spaces_dict.data is defined %} + admin: admin +{% else %} + admin: internal +{% endif %} +{% if opnfv.spaces_dict.public is defined %} + public: public +{% else %} + public: internal +{% endif %} options: openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" region: {{ os.region }} admin-role: {{ os.admin.role }} keystone-admin-role: {{ os.admin.role }} + preferred-api-version: 3 {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} {% endif %} |