summaryrefslogtreecommitdiffstats
path: root/ci/config_tpl/bundle_tpl/keystone.yaml
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-10-06 22:40:38 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-10-06 22:54:19 -0500
commit1e59c89faec7ff45140227c8db1c00cf63d9b45b (patch)
tree64f97cf71d1c102b7f1d78d9d17c77cabedff8c9 /ci/config_tpl/bundle_tpl/keystone.yaml
parent4b367d124bece258eb520c7878de835b37a01abb (diff)
modified to fix the opencontrail bundle issue for nonha.
Change-Id: I3b35c8bb4d9ceecdacebf2b092fe38acb77b5076 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/config_tpl/bundle_tpl/keystone.yaml')
-rw-r--r--ci/config_tpl/bundle_tpl/keystone.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/ci/config_tpl/bundle_tpl/keystone.yaml b/ci/config_tpl/bundle_tpl/keystone.yaml
index 24f5b102..991dfa4b 100644
--- a/ci/config_tpl/bundle_tpl/keystone.yaml
+++ b/ci/config_tpl/bundle_tpl/keystone.yaml
@@ -2,6 +2,7 @@
charm: "local:{{ ubuntu.release }}/keystone"
num_units: {{ unit_qty() }}
options:
+ openstack-origin: "cloud:{{ ubuntu.release }}-{{ os.release }}"
admin-password: {{ opnfv.admin_password | default(os.admin.password) }}
admin-token: {{ os.admin.name }}
{% if os.ha.mode == 'ha' %}