← Back to branch summary

~ajkavanagh/openstack-mojo-specs/fix-os-project-id-nova-creds

« back to all changes in this revision

Viewing changes to helper/utils/mojo_utils.py

  • Committer: Alex Kavanagh
  • Date: 2017-09-06 15:07:39 UTC
  • Revision ID: alex.kavanagh@canonical.com-20170906150739-ede5gvcw10bw2pbg
Fix OS_PROJECT_ID polution from env to overcloud nova creds
Also some fixes for keystone client and service_catalog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
helper/utils/mojo_utils.py
354
354
                os.environ.get('OS_PROJECT_NAME'))
355
355
            auth_settings['OS_PROJECT_DOMAIN_NAME'] = (
356
356
                os.environ.get('OS_PROJECT_DOMAIN_NAME'))
 
357
            os_project_id = os.environ.get('OS_PROJECT_ID')
 
358
            if os_project_id is not None:
 
359
                auth_settings['OS_PROJECT_ID'] = os_project_id
357
360
 
358
361
    # Validate settings
359
362
    for key, settings in auth_settings.items():