Merge lp:~ajkavanagh/openstack-mojo-specs/fix-os-project-id-nova-creds into lp:~ost-maintainers/openstack-mojo-specs/mojo-openstack-specs-1709

[Alex Kavanagh]

Fix OS_PROJECT_ID polution from env to overcloud nova creds
Also some fixes for keystone client and service_catalog.

[Ryan Beisner (1chb1n)]

I've not exercised this, and I've also not had any mojo specs fail without this (hundres have run in OSCI). Please have gnuoy and/or thedac review. Thank you.

review: Needs Information

[Liam Young (gnuoy)]

I think the issue may come from whether you have a novarc sourced when you run mojo. I'm +1 on removing the os.environ.get('OS_PROJECT_ID') from helper/utils/mojo_os_utils.py

Only issue for me seems to be some code duplication.

review: Needs Fixing

[David Ames (thedac)]

Agree with Liam. The project id move is fine. The get_keystone_session_client supersedes get_keystone_client so that bit can left as is.

[Alex Kavanagh (ajkavanagh)]

David, Liam: I don't understand either of your comments. What do you want to keep? What do you want to remove?

[Liam Young (gnuoy)]

Alex, a function exists that returns a keystone session object based on the api version. That function is called get_keystone_session. You have amended (admittedly pre-existing) code in get_keystone_client that creates a keystone session object based on the api version. I am suggesting that rather than have logic for getting a keystone session object based on the api version in get_keystone_client, get_keystone_client should call get_keystone_session.

[Alex Kavanagh (ajkavanagh)]

Liam, please see inline comment. Please could you review your 'needs fixing' or suggest a solution that maintains backwards compatibility. Thanks.

[Liam Young (gnuoy)]

ok

=== modified file 'helper/utils/mojo_os_utils.py'
--- helper/utils/mojo_os_utils.py	2017-08-30 17:25:03 +0000
+++ helper/utils/mojo_os_utils.py	2017-09-06 15:12:56 +0000
@@ -28,8 +28,8 @@
 # Openstack Client helpers
 def get_nova_creds(cloud_creds):
     auth = get_ks_creds(cloud_creds)
-    if os.environ.get('OS_PROJECT_ID'):
-        auth['project_id'] = os.environ.get('OS_PROJECT_ID')
+    if cloud_creds.get('OS_PROJECT_ID'):
+        auth['project_id'] = cloud_creds.get('OS_PROJECT_ID')
     return auth
 
 
@@ -111,11 +111,16 @@
 def get_keystone_client(novarc_creds, insecure=True):
     keystone_creds = get_ks_creds(novarc_creds)
     if novarc_creds.get('API_VERSION', 2) == 2:
-        sess = v2.Password(**keystone_creds)
-        return keystoneclient_v2.Client(session=sess)
+        auth = v2.Password(**keystone_creds)
+        sess = session.Session(auth=auth, verify=True)
+        client = keystoneclient_v2.Client(session=sess)
     else:
-        sess = v3.Password(**keystone_creds)
-        return keystoneclient_v3.Client(session=sess)
+        auth = v3.Password(**keystone_creds)
+        sess = get_keystone_session(novarc_creds, insecure)
+        client = keystoneclient_v3.Client(session=sess)
+    # This populates the client.service_catalog
+    client.auth_ref = auth.get_access(sess)
+    return client
 
 
 def get_swift_client(novarc_creds, insecure=True):
@@ -136,7 +141,7 @@
     if novarc_creds.get('API_VERSION', 2) == 2:
         kc = get_keystone_client(novarc_creds)
         glance_ep_url = kc.service_catalog.url_for(service_type='image',
-                                                   endpoint_type='publicURL')
+                                                   interface='publicURL')
     else:
         keystone_creds = get_ks_creds(novarc_creds, scope='PROJECT')
         kc = keystoneclient_v3.Client(**keystone_creds)
 
=== modified file 'helper/utils/mojo_utils.py'
--- helper/utils/mojo_utils.py	2017-09-05 22:27:05 +0000
+++ helper/utils/mojo_utils.py	2017-09-06 15:12:56 +0000
@@ -354,6 +354,9 @@
                 os.environ.get('OS_PROJECT_NAME'))
             auth_settings['OS_PROJECT_DOMAIN_NAME'] = (
                 os.environ.get('OS_PROJECT_DOMAIN_NAME'))
+            os_project_id = os.environ.get('OS_PROJECT_ID')
+            if os_project_id is not None:
+                auth_settings['OS_PROJECT_ID'] = os_project_id
 
     # Validate settings
     for key, settings in auth_settings.items():