CORD-2933 Add domain to auth
Change-Id: I30f0c82e9f85f6c3efef7b21e7decd2f937b9896
diff --git a/xos/synchronizer/steps/sync_controller_site_privileges.py b/xos/synchronizer/steps/sync_controller_site_privileges.py
index 28c70d4..72e5b04 100644
--- a/xos/synchronizer/steps/sync_controller_site_privileges.py
+++ b/xos/synchronizer/steps/sync_controller_site_privileges.py
@@ -36,7 +36,7 @@
return
roles = [controller_site_privilege.site_privilege.role.role]
- # setup user home site roles at controller
+ # setup user home site roles at controller
if not controller_site_privilege.site_privilege.user.site:
raise Exception('Siteless user %s'%controller_site_privilege.site_privilege.user.email)
else:
@@ -47,7 +47,7 @@
#if ctrl_site_deployments:
# # need the correct tenant id for site at the controller
- # tenant_id = ctrl_site_deployments[0].tenant_id
+ # tenant_id = ctrl_site_deployments[0].tenant_id
# tenant_name = ctrl_site_deployments[0].site_deployment.site.login_base
user_fields = {
'endpoint':controller_site_privilege.controller.auth_url,
@@ -61,12 +61,12 @@
'ansible_tag':'%s@%s'%(controller_site_privilege.site_privilege.user.email.replace('@','-at-'),controller_site_privilege.controller.name),
'admin_tenant': controller_site_privilege.controller.admin_tenant,
'roles':roles,
- 'tenant':controller_site_privilege.site_privilege.site.login_base}
-
+ 'tenant':controller_site_privilege.site_privilege.site.login_base}
+
return user_fields
def map_sync_outputs(self, controller_site_privilege, res):
- # results is an array in which each element corresponds to an
+ # results is an array in which each element corresponds to an
# "ok" string received per operation. If we get as many oks as
# the number of operations we issued, that means a grand success.
# Otherwise, the number of oks tell us which operation failed.
@@ -81,15 +81,15 @@
if controller_site_privilege.role_id:
driver = self.driver.admin_driver(controller=controller_site_privilege.controller)
user = ControllerUser.objects.get(
- controller=controller_site_privilege.controller,
+ controller=controller_site_privilege.controller,
user=controller_site_privilege.site_privilege.user
)
site = ControllerSite.objects.get(
- controller=controller_site_privilege.controller,
+ controller=controller_site_privilege.controller,
user=controller_site_privilege.site_privilege.user
)
driver.delete_user_role(
- user.kuser_id,
- site.tenant_id,
+ user.kuser_id,
+ site.tenant_id,
controller_site_privilege.site_prvilege.role.role
)