From 137221f537ab6640fab0299232c9d5e781d0f914 Mon Sep 17 00:00:00 2001 From: Rurik Yla-Onnenvuori Date: Fri, 10 Nov 2017 14:54:07 +0100 Subject: [PATCH] New instance parameter 'groups' User can define supplementary groups for instance and fenced users. Multiple groups can be defined as an array. --- README.md | 1 + manifests/instance.pp | 3 +++ spec/defines/instance_spec.rb | 5 ++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 973bf8d..3223f33 100644 --- a/README.md +++ b/README.md @@ -124,6 +124,7 @@ db2::install { '11.1': * `instance_user_uid`: UID of the instance user * `instance_user_gid`: GID of the instance user * `instance_user_home`: Home directory of the instance user +* `groups`: An array of supplementary groups for instance and fence users (optional, default: undef) * `type`: Type of product this instance is for (default: ese) * `auth`: Type of auth for this instance (default: server) * `users_forcelocal`: Force the creation of instance and fence users to be local, true or false. (default: undef) diff --git a/manifests/instance.pp b/manifests/instance.pp index 2588a24..be709a7 100644 --- a/manifests/instance.pp +++ b/manifests/instance.pp @@ -14,6 +14,7 @@ $instance_user_uid = undef, $instance_user_gid = undef, $instance_user_home = undef, + $groups = undef, $users_forcelocal = undef, $port = undef, $type = 'ese', @@ -32,6 +33,7 @@ home => $fence_user_home, forcelocal => $users_forcelocal, managehome => true, + groups => $groups, } } } @@ -43,6 +45,7 @@ home => $instance_user_home, forcelocal => $users_forcelocal, managehome => true, + groups => $groups, } } diff --git a/spec/defines/instance_spec.rb b/spec/defines/instance_spec.rb index a5b510e..cc4bb74 100644 --- a/spec/defines/instance_spec.rb +++ b/spec/defines/instance_spec.rb @@ -69,12 +69,14 @@ :fence_user_uid => '1002', :fence_user_gid => 'db2fencg', :fence_user_home => '/db2/fence', + :groups => 'db2group', }} it do is_expected.to contain_user('db2inst').with( :uid => '1001', :gid => 'db2instg', - :home => '/db2/inst' + :home => '/db2/inst', + :groups => 'db2group', ) end it do @@ -82,6 +84,7 @@ :uid => '1002', :gid => 'db2fencg', :home => '/db2/fence', + :groups => 'db2group', ) end end