Use keystone auth environment variables
Signed-off-by: Steven Dake <sdake@redhat.com>
This commit is contained in:
parent
6dc0039468
commit
024ccee734
8
bin/heat
8
bin/heat
|
@ -277,9 +277,9 @@ def jeos_create(options, arguments):
|
||||||
|
|
||||||
print 'Registering JEOS image with OpenStack Glance.'
|
print 'Registering JEOS image with OpenStack Glance.'
|
||||||
|
|
||||||
creds = dict(username=os.getenv('OS_AUTH_USER'),
|
creds = dict(username=os.getenv('OS_USERNAME'),
|
||||||
password=os.getenv('OS_AUTH_KEY'),
|
password=os.getenv('OS_PASSWORD'),
|
||||||
tenant=os.getenv('OS_AUTH_TENANT'),
|
tenant=os.getenv('OS_TENANT_NAME'),
|
||||||
auth_url=os.getenv('OS_AUTH_URL'),
|
auth_url=os.getenv('OS_AUTH_URL'),
|
||||||
strategy=os.getenv('OS_AUTH_STRATEGY', 'noauth'))
|
strategy=os.getenv('OS_AUTH_STRATEGY', 'noauth'))
|
||||||
|
|
||||||
|
@ -296,7 +296,7 @@ def jeos_create(options, arguments):
|
||||||
'disk_format': 'qcow2',
|
'disk_format': 'qcow2',
|
||||||
'min_disk': 0,
|
'min_disk': 0,
|
||||||
'min_ram': 0,
|
'min_ram': 0,
|
||||||
'owner': os.getenv('OS_AUTH_USER'),
|
'owner': os.getenv('OS_USERNAME'),
|
||||||
'container_format': 'bare'}
|
'container_format': 'bare'}
|
||||||
|
|
||||||
images = client.get_images(**parameters)
|
images = client.get_images(**parameters)
|
||||||
|
|
Loading…
Reference in New Issue