x/anvil
Code Issues Proposed changes

reflecting devstack v1 keystone init changes and nova changes

Browse Source
This commit is contained in:
Joshua Harlow
2012-03-06 20:02:02 -08:00
parent 1ca4a15d48
commit 53fb6d29c7
6 changed files with 151 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/image/creator.py
View File

@@ -217,8 +217,6 @@ class ImageCreationService:
def _get_token(self):
LOG.info("Fetching your keystone admin token so that we can perform image uploads.")
pwd = self.cfg.get("passwords", "horizon_keystone_admin")
key_users = keystone.get_shared_users(self.cfg)
key_params = keystone.get_shared_params(self.cfg)
keystone_service_url = key_params['SERVICE_ENDPOINT']
keystone_token_url = "%s/tokens" % (keystone_service_url)
@@ -230,10 +228,10 @@ class ImageCreationService:
{
"passwordCredentials":
{
"username": key_users['ADMIN_USER_NAME'],
"password": pwd,
"username": key_params['ADMIN_USER_NAME'],
"password": key_params['ADMIN_PASSWORD'],
},
"tenantName": key_users['ADMIN_TENANT_NAME'],
"tenantName": key_params['ADMIN_TENANT_NAME'],
}
})