Projet

Général

Profil

0001-agent-authentic2-attach-roles-to-their-service-s-ou-.patch

Benjamin Dauvergne, 22 juin 2015 22:36

Télécharger (2,37 ko)

Voir les différences: 

Subject: [PATCH] agent/authentic2: attach roles to their service's ou (fixes
 #7648)


 hobo/agent/authentic2/management/commands/hobo_deploy.py      | 2 +-
 hobo/agent/authentic2/management/commands/import-wcs-roles.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
hobo/agent/authentic2/management/commands/hobo_deploy.py
151 151 
                Role = get_role_model()
152 152 
                su_role, created = Role.objects.get_or_create(
153 153 
                    service=provider, slug='_a2-hobo-superuser',
154 
                    defaults={'name': _('Superuser')})
154 
                    ou=provider.ou, defaults={'name': _('Superuser')})
155 155 
                su_role.attributes.get_or_create(name='is_superuser',
156 156 
                                                 kind='string',
157 157 
                                                 value='true')
hobo/agent/authentic2/management/commands/import-wcs-roles.py
46 46 
            self.delete_dead_roles()
47 47 
        su_role, created = Role.objects.get_or_create(
48 48 
            service=self.service, slug='_a2-hobo-superuser',
49 
            defaults={'name': _('Superuser')})
49 
            ou=self.service.ou, defaults={'name': _('Superuser')})
50 50 
        su_role.attributes.get_or_create(name='is_superuser', kind='string',
51 51 
                                         value='true')
52 52 

  		




  ......




  60
  60
  
    
        # search role by external id, create if not found

  		




  61
  61
  
    
        role, created = Role.objects.get_or_create(

  		




  62
  62
  
    
            service=self.service,

  		




  
  63
  
    
            ou=self.service.ou,

  		




  63
  64
  
    
            external_id=role_tpl.external_id,

  		




  64
  65
  
    
            defaults=defaults)

  		




  65
  66
  
    
        RoleAttribute.objects.filter(role=role).delete()

  		




  66
  
  
    
-