diff options
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 9 | ||||
| -rwxr-xr-x | kolla/image/build.py | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 9a441df69..61d078421 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -954,10 +954,11 @@ def get_source_opts(type_=None, location=None, reference=None): 'or branch name'))] -def get_user_opts(uid, gid): +def get_user_opts(uid, gid, group): return [ cfg.IntOpt('uid', default=uid, help='The user id'), cfg.IntOpt('gid', default=gid, help='The group id'), + cfg.StrOpt('group', default=group, help='The group name'), ] @@ -965,7 +966,11 @@ def gen_all_user_opts(): for name, params in USERS.items(): uid = params['uid'] gid = params['gid'] - yield name, get_user_opts(uid, gid) + try: + group = params['group'] + except KeyError: + group = name[:-5] + yield name, get_user_opts(uid, gid, group) def gen_all_source_opts(): diff --git a/kolla/image/build.py b/kolla/image/build.py index fc897bdd2..f643a90b4 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -852,6 +852,7 @@ class KollaWorker(object): ret[match.group(0)[:-5]] = { 'uid': user.uid, 'gid': user.gid, + 'group': user.group, } return ret |