Changeset 2590 for trunk


Ignore:
Timestamp:
Dec 7, 2009, 9:33:43 PM (15 years ago)
Author:
broder
Message:

Store AFS cell configuration at authz.afs.cells instead of just
authz.cells, to be more clear about purpose.

Location:
trunk/packages
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/packages/invirt-base/python/invirt/authz/locker.py

    r2572 r2590  
    5959    or a group) in the home cell (athena.mit.edu for XVM).
    6060    """
    61     cell = config.authz.cells[0].cell
     61    cell = config.authz.afs.cells[0].cell
    6262    auth = _authenticate(cell)
    6363    return _expandGroup(name, cell=cell, auth=auth)
    … …  
    8585    cells distantly related to the machine's home realm.
    8686    """
    87     for c in config.authz.cells:
     87    for c in config.authz.afs.cells:
    8888        if c.cell == cell and not c.auth:
    8989            return False

  • trunk/packages/invirt-database/python/database/validate.py

    r2557 r2590  
    241241        admin = 'system:' + admin
    242242    try:
    243         if user in getafsgroups.getAfsGroupMembers(admin, config.authz.cells[0].cell):
     243        if user in getafsgroups.getAfsGroupMembers(admin, config.authz.afs.cells[0].cell):
    244244            return admin
    245245    except getafsgroups.AfsProcessError, e:

  • trunk/packages/invirt-web/code/cache_acls.py

    r2557 r2590  
    4040        return []
    4141    try:
    42         return getafsgroups.getAfsGroupMembers(name, config.authz.cells[0].cell)
     42        return getafsgroups.getAfsGroupMembers(name, config.authz.afs.cells[0].cell)
    4343    except getafsgroups.AfsProcessError:
    4444        return []

  • trunk/packages/invirt-web/code/getafsgroups.py

    r2557 r2590  
    3131def getAfsGroupMembers(group, cell):
    3232    encrypt = True
    33     for c in config.authz.cells:
     33    for c in config.authz.afs.cells:
    3434        if c.cell == cell and hasattr(c, 'auth'):
    3535            encrypt = c.auth

  • trunk/packages/invirt-web/code/validation.py

    r2557 r2590  
    223223        admin = 'system:' + admin
    224224    try:
    225         if user in getafsgroups.getAfsGroupMembers(admin, config.authz.cells[0].cell):
     225        if user in getafsgroups.getAfsGroupMembers(admin, config.authz.afs.cells[0].cell):
    226226            return admin
    227227    except getafsgroups.AfsProcessError, e:

  • trunk/packages/invirt-web/invirt-cache-acls

    r2557 r2590  
    11#!/bin/sh
    22cells () {
    3   for i in $(invirt-getconf -l authz.cells); do
    4     invirt-getconf authz.cells.$i.cell
     3  for i in $(invirt-getconf -l authz.afs.cells); do
     4    invirt-getconf authz.afs.cells.$i.cell
    55  done
    66}

  • trunk/packages/xvm-devconfig/master.yaml

    r2574 r2590  
    77authz:
    88 mech: invirt.authz.locker
    9  cells:
    10  - cell: athena.mit.edu
    11    auth: no
    12  - cell: sipb.mit.edu
    13    auth: yes
    14  - cell: zone.mit.edu
    15    auth: no
    16  - cell: ops.mit.edu
    17    auth: no
    18  - cell: net.mit.edu
    19    auth: no
    20  - cell: dev.mit.edu
    21    auth: no
     9 afs:
     10  cells:
     11  - cell: athena.mit.edu
     12    auth: no
     13  - cell: sipb.mit.edu
     14    auth: yes
     15  - cell: zone.mit.edu
     16    auth: no
     17  - cell: ops.mit.edu
     18    auth: no
     19  - cell: net.mit.edu
     20    auth: no
     21  - cell: dev.mit.edu
     22    auth: no
    2223
    2324hosts: # hosts on which VMs run

  • trunk/packages/xvm-prodconfig/master.yaml

    r2574 r2590  
    88authz:
    99 mech: invirt.authz.locker
    10  cells:
    11  - cell: athena.mit.edu
    12    auth: yes
    13  - cell: sipb.mit.edu
    14    auth: yes
    15  - cell: zone.mit.edu
    16    auth: yes
    17  - cell: ops.mit.edu
    18    auth: no
    19  - cell: net.mit.edu
    20    auth: no
    21  - cell: dev.mit.edu
    22    auth: no
     10 afs:
     11  cells:
     12  - cell: athena.mit.edu
     13    auth: yes
     14  - cell: sipb.mit.edu
     15    auth: yes
     16  - cell: zone.mit.edu
     17    auth: yes
     18  - cell: ops.mit.edu
     19    auth: no
     20  - cell: net.mit.edu
     21    auth: no
     22  - cell: dev.mit.edu
     23    auth: no
    2324
    2425console:
Note: See TracChangeset for help on using the changeset viewer.