From: root <root@ip-172-31-38-128.ec2.internal>
Date: Wed, 15 Oct 2014 12:55:40 +0000 (-0400)
Subject: Bug fixes in ansible driver
X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=6d70df8d258bf6b101a192598db7e74ec9ca91b5

Bug fixes in ansible driver
---

diff --git a/planetstack/openstack_observer/steps/sync_user_deployments.py b/planetstack/openstack_observer/steps/sync_user_deployments.py
index de4ce76..3656461 100644
--- a/planetstack/openstack_observer/steps/sync_user_deployments.py
+++ b/planetstack/openstack_observer/steps/sync_user_deployments.py
@@ -46,9 +46,11 @@ class SyncUserDeployments(OpenStackSyncStep):
             if site_deployments:
                 # need the correct tenant id for site at the deployment
                 tenant_id = site_deployments[0].tenant_id  
-		roles.add('user')
+		tenant_name =site_deployments[0].site.login_base
+
+		roles.append('user')
                 if user_deployment.user.is_admin:
-                    roles.add('admin')
+                    roles.append('admin')
 
 
         user_fields = {'endpoint':user_deployment.deployment.auth_url,
@@ -57,8 +59,9 @@ class SyncUserDeployments(OpenStackSyncStep):
                        'password': hashlib.md5(user_deployment.user.password).hexdigest()[:6],
                        'admin_user': user_deployment.deployment.admin_user,
 		       'admin_password': user_deployment.deployment.admin_password,
+		       'admin_tenant': 'admin',
 		       'roles':roles,
-		       'tenant':tenant_id}    
+		       'tenant':tenant_name}    
 	
 	rendered = template.render(user_fields)
 	res = run_template('sync_user_deployments.yaml', user_fields)