openstack/os-cloud-config
Code Issues Proposed changes

Do not pass the 'public' endpoint when doing pki initialization

Browse Source 
We should not pass the 'public' argument when doing the pki
initialization or when creating the keystone clients because 'public'
is meant to be the value to use for the public endpoint (as also the
param description suggests) and not the host against which connecting
to do the pki (via ssh) or endpoints (via http) setup, that is the
'host' param instead.

Change-Id: I8f156b3dee1df2915ca9638fa40116d0b48c09e1
This commit is contained in:
Giulio Fidente
2015-11-30 17:46:25 +01:00
parent 1c79a4b996
commit fddf26df01
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
os_cloud_config/keystone.py
View File

@@ -150,8 +150,8 @@ def initialize(host, admin_token, admin_email, admin_password,
default is not suitable default is not suitable
""" """
keystone_v2 = _create_admin_client_v2(host, admin_token, public) keystone_v2 = _create_admin_client_v2(host, admin_token)
keystone_v3 = _create_admin_client_v3(host, admin_token, ssl, public) keystone_v3 = _create_admin_client_v3(host, admin_token, ssl)
_create_roles(keystone_v2, timeout, poll_interval) _create_roles(keystone_v2, timeout, poll_interval)
_create_tenants(keystone_v2) _create_tenants(keystone_v2)
@@ -162,7 +162,7 @@ def initialize(host, admin_token, admin_email, admin_password,
if pki_setup: if pki_setup:
print("PKI initialization in init-keystone is deprecated and will be " print("PKI initialization in init-keystone is deprecated and will be "
"removed.") "removed.")
_perform_pki_initialization(public or host, user) _perform_pki_initialization(host, user)
def initialize_for_swift(host, admin_token, ssl=None, public=None): def initialize_for_swift(host, admin_token, ssl=None, public=None):