diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2017-08-15 13:28:22 -0500 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2017-08-15 14:02:27 -0500 |
commit | e9a56336b664f4575194c2317aa747652a2ecb6f (patch) | |
tree | b05ae1c0cd57c9a8d6fcd33f6ee947229895f216 /ci/config_tpl/juju2/bundle_tpl/keystone.yaml | |
parent | dc5adfcfe2f4c2534ad512f8d3b811d86a473089 (diff) |
modified templates and added variable to easlity understand the
templates and added support for multiple networks.
Change-Id: I1074c722c9007bd12c711dbfc58afa1a098d2a17
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 | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml index 0d21f649..22912e68 100644 --- a/ci/config_tpl/juju2/bundle_tpl/keystone.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/keystone.yaml @@ -3,21 +3,18 @@ num_units: {{ unit_qty() }} {% if os.service.bindings %} bindings: - internal: internal-api - admin: internal-api - shared-db: internal-api -{% if opnfv.spaces_dict.public is defined %} - public: public-api -{% else %} - public: internal-api -{% endif %} + "": *oam-space + public: *public-space + admin: *admin-space + internal: *internal-space + shared-db: *internal-space {% endif %} options: - openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}" + openstack-origin: *openstack-origin {% if os.git_repo.origin_git %} openstack-origin-git: "{{ os.git_repo.branch }}" {% endif %} - region: {{ os.region }} + region: *openstack-region admin-role: {{ os.admin.role }} keystone-admin-role: {{ os.admin.role }} preferred-api-version: 3 @@ -25,7 +22,7 @@ prefer-ipv6: {{ os.network.ipv6 }} {% endif %} {% if os.api.worker_multiplier %} - worker-multiplier: {{ os.api.worker_multiplier }} + worker-multiplier: *worker-multiplier {% endif %} admin-password: {{ opnfv.admin_password | default(os.admin.password) }} admin-token: {{ os.admin.name }} |