← Back to branch summary

~chris.macnaughton/openstack-mojo-specs/update-ha-timeouts

« back to all changes in this revision

Viewing changes to helper/setup/image_setup.py

  • Committer: David Ames
  • Date: 2017-04-14 15:47:35 UTC
  • mfrom: (304.1.5 mojo-openstack-specs)
  • Revision ID: david.ames@canonical.com-20170414154735-13fbuk55fcdpn79p
[thedac, r=beisner] Update mojo utilities for keystone v3 and Ocata clients

Show diffs side-by-side

added added

removed removed

Lines of Context:
helper/setup/image_setup.py
8
8
 
9
9
def main(argv):
10
10
    mojo_utils.setup_logging()
11
 
    overcloud_novarc = mojo_utils.get_overcloud_auth()
12
 
    glance_client = mojo_os_utils.get_glance_client(overcloud_novarc)
 
11
    session = (
 
12
        mojo_os_utils.get_keystone_session(mojo_utils.get_overcloud_auth()))
 
13
    glance_client = mojo_os_utils.get_glance_session_client(session)
13
14
    current_images = mojo_os_utils.get_images_list(glance_client)
14
15
    image_config = mojo_utils.get_mojo_config('images.yaml')
15
16
    cache_dir = '/tmp/img_cache'
32
33
            image_config[image]['disk_format'],
33
34
            image_config[image]['container_format'])
34
35
 
 
36
 
35
37
if __name__ == "__main__":
36
38
    sys.exit(main(sys.argv))