openstack
/
cookbook-openstack-compute
Code Issues Proposed changes

Merge pull request #81 from galstrom21/master 

Miss typed a few variables
This commit is contained in:
Ron Pedde 2012-06-19 14:08:36 -07:00
parent d239868d70 5611077ce9
commit 0b68b71ab8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
attributes/default.rb
View File

@ -1,6 +1,6 @@
########################################################################
# Toggles - These can be overridden at the environment level
default["enable_monit"] = true # OS provides packages
default["enable_monit"] = false # OS provides packages
default["developer_mode"] = false # we want secure passwords by default
########################################################################

8
files/default/nova_plugin.py
View File

@ -18,9 +18,9 @@ def get_stats(user, passwd, tenant, url):
# Find my uuid
user_list = keystone.users.list()
admin_uuid = ""
for user in user_list:
if user.name == username:
admin_uuid = user.id
for usr in user_list:
if usr.name == user:
admin_uuid = usr.id
# Find out which tenants I have roles in
tenant_list = keystone.tenants.list()
@ -43,7 +43,7 @@ def get_stats(user, passwd, tenant, url):
# for tenant in tenant_list:
for tenant in my_tenants:
client = NovaClient("1.1",username,password,tenant['name'],auth_url,service_type="compute")
client = NovaClient("1.1",user,passwd,tenant['name'],url,service_type="compute")
# Figure out how much ram has been allocated total for all servers
server_list = client.servers.list()