Skip to content

Commit

Permalink
Derive value for enable_keystone_v3 based on keystone version
Browse files Browse the repository at this point in the history
Change-Id: Ia61af991ca18e364903925d698e6c93498a8ac0c
Partial-bug: #1715427
  • Loading branch information
ramprackash committed Sep 9, 2017
1 parent 80b03ca commit 3bd688b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/server_mgr_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -6464,14 +6464,17 @@ def build_calculated_kolla_params(self, cluster, cluster_servers, pkg):

# 2. Keystone params
kolla_globals["keystone_admin_user"] = ks.get("admin_user", "admin")
kolla_globals["version"] = ks.get("version", "v2.0")
if kolla_globals["version"] == 'v2.0':
keystone_ver = ks.get("version", "v2.0")
if keystone_ver == 'v2.0':
kolla_globals["keystone_admin_url"] = ("{{ admin_protocol }}://"
"{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}")
kolla_globals["keystone_internal_url"] = ("{{ internal_protocol }}:"
"//{{ kolla_internal_fqdn }}:{{ keystone_public_port }}")
kolla_globals["keystone_public_url"] = ("{{ public_protocol }}://"
"{{ kolla_external_fqdn }}:{{ keystone_public_port }}")
kolla_globals["enable_keystone_v3"] = "no"
else:
kolla_globals["enable_keystone_v3"] = "yes"

# 3. HA params from openstack section
kolla_globals["kolla_internal_vip_address"] = os_dict["ctrl_data_ip"]
Expand Down

0 comments on commit 3bd688b

Please sign in to comment.