From: Steven Dake <sdake@redhat.com>
Date: Thu, 22 Mar 2012 16:08:16 +0000 (-0700)
Subject: Use keystone auth environment variables
X-Git-Tag: 2014.1~2166
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=024ccee73475d227040c7927c3f6151614a3092f;p=openstack-build%2Fheat-build.git

Use keystone auth environment variables

Signed-off-by: Steven Dake <sdake@redhat.com>
---

diff --git a/bin/heat b/bin/heat
index 8d7fc813..b7185686 100755
--- a/bin/heat
+++ b/bin/heat
@@ -277,9 +277,9 @@ def jeos_create(options, arguments):
 
     print 'Registering JEOS image with OpenStack Glance.'
 
-    creds = dict(username=os.getenv('OS_AUTH_USER'),
-            password=os.getenv('OS_AUTH_KEY'),
-            tenant=os.getenv('OS_AUTH_TENANT'),
+    creds = dict(username=os.getenv('OS_USERNAME'),
+            password=os.getenv('OS_PASSWORD'),
+            tenant=os.getenv('OS_TENANT_NAME'),
             auth_url=os.getenv('OS_AUTH_URL'),
             strategy=os.getenv('OS_AUTH_STRATEGY', 'noauth'))
 
@@ -296,7 +296,7 @@ def jeos_create(options, arguments):
                   'disk_format': 'qcow2',
                   'min_disk': 0,
                   'min_ram': 0,
-                  'owner': os.getenv('OS_AUTH_USER'),
+                  'owner': os.getenv('OS_USERNAME'),
                   'container_format': 'bare'}
 
     images = client.get_images(**parameters)