Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Synchronize Puppet DPM with UMD-3 #216

Merged
merged 6 commits into from Oct 2, 2018
Merged

Synchronize Puppet DPM with UMD-3 #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7d90f2
Synchronize Puppet DPM with UMD-3
Pansanel Aug 27, 2018
6e39685
Synchronize with templates in production at GRIF
Pansanel Aug 28, 2018
791e008
Merge remote-tracking branch 'upstream/umd-4' into umd-4
Pansanel Aug 29, 2018
451f686
Remove empty line
Pansanel Aug 29, 2018
fe2f24b
Add missing spaces and fix panlint issue
Pansanel Aug 29, 2018
784efbc
Improve code syntax
Pansanel Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions personality/se_dpm/puppet/federations.pan
View file
Open in desktop
Expand Up @@ -3,10 +3,10 @@ unique template personality/se_dpm/puppet/federations;

'/software/packages' = {
if (is_defined(XROOTD_FEDERATION_PARAMS)) {
if(is_defined(XROOTD_FEDERATION_PARAMS['cms'])){
if (is_defined(XROOTD_FEDERATION_PARAMS['cms'])) {
pkg_repl('xrootd-cmstfc');
};
if(is_defined(XROOTD_FEDERATION_PARAMS['atlas'])){
if (is_defined(XROOTD_FEDERATION_PARAMS['atlas'])) {
pkg_repl('xrootd-server-atlas-n2n-plugin');
};
};
Expand Down
28 changes: 21 additions & 7 deletions personality/se_dpm/puppet/info_user_proxy.pan
View file
Open in desktop
Expand Up @@ -22,21 +22,34 @@ include 'components/cron/config';
variable DPM_HOSTPROXY_CRON = SEDPM_INFO_USER + "-hostproxy";
variable DPM_HOSTPROXY_TMP = GLITE_LOCATION_VAR + "/dpm/hostproxy.$$";
variable DPM_HOSTPROXY_FILE = GLITE_LOCATION_VAR + "/dpm/hostproxy." + SEDPM_INFO_USER;
variable DPM_HOSTPROXY_CMD = "mkdir -p /var/lib/ldap/.globus && /bin/cp /etc/grid-security/hostcert.pem /var/lib/ldap/.globus/usercert.pem && /bin/cp /etc/grid-security/hostkey.pem /var/lib/ldap/.globus/userkey.pem && chown -R " + SEDPM_INFO_USER + " /var/lib/ldap/.globus";
"/software/components/cron/entries" = {
push(dict(
variable DPM_HOSTPROXY_CMD = {
"mkdir -p /var/lib/ldap/.globus && " +
"/bin/cp /etc/grid-security/hostcert.pem /var/lib/ldap/.globus/usercert.pem && " +
"/bin/cp /etc/grid-security/hostkey.pem /var/lib/ldap/.globus/userkey.pem && " +
"chown -R " + SEDPM_INFO_USER + " /var/lib/ldap/.globus";
};
Pansanel marked this conversation as resolved.
Show resolved Hide resolved

"/software/components/cron/entries" = push(
dict(
"name", DPM_HOSTPROXY_CRON,
"user", "root",
"frequency", "AUTO 2,8,14,20 * * *",
"command", DPM_HOSTPROXY_CMD)
);
};
"command", DPM_HOSTPROXY_CMD
)
);

# Startup script to ensure a valid proxy at boot time (or when the command to generate it is changed
include 'components/filecopy/config';
include 'components/chkconfig/config';
variable DPM_HOSTPROXY_STARTUP = '/etc/init.d/' + DPM_HOSTPROXY_CRON;
variable DPM_HOSTPROXY_STARTUP_CONTENTS = "#!/bin/sh\n" + "#\n" + "# chkconfig: - 92 5\n" + "# description: BDII Service\n" + DPM_HOSTPROXY_CMD;
variable DPM_HOSTPROXY_STARTUP_CONTENTS = {
"#!/bin/sh\n" +
"#\n" +
"# chkconfig: - 92 5\n" +
"# description: BDII Service\n" +
DPM_HOSTPROXY_CMD
};
Pansanel marked this conversation as resolved.
Show resolved Hide resolved

'/software/components/filecopy/services' = {
SELF[escape(DPM_HOSTPROXY_STARTUP)] = dict(
'config', DPM_HOSTPROXY_STARTUP_CONTENTS,
Expand All @@ -46,6 +59,7 @@ variable DPM_HOSTPROXY_STARTUP_CONTENTS = "#!/bin/sh\n" + "#\n" + "# chkconfig:
);
SELF;
};

'/software/components/chkconfig' = {
if ( index('filecopy', SELF['dependencies']['pre']) < 0 ) {
SELF['dependencies']['pre'][length(SELF['dependencies']['pre'])] = 'filecopy';
Expand Down
14 changes: 7 additions & 7 deletions personality/se_dpm/puppet/no_pool_accounts.pan
View file
Open in desktop
Expand Up @@ -3,8 +3,8 @@ unique template personality/se_dpm/puppet/no_pool_accounts;
include 'components/accounts/config';

'/software/components/accounts/users' = {
foreach(i; user; SELF){
if(is_defined(user["poolSize"]) && (user["poolSize"]>1)){
foreach(i; user; SELF) {
if (is_defined(user["poolSize"]) && (user["poolSize"]>1)) {
user["poolSize"] = null;
user["poolDigits"] = null;
user["poolStart"] = null;
Expand All @@ -14,16 +14,16 @@ include 'components/accounts/config';
};

'/system/vo' = {
foreach(i; vo; SELF){
foreach(j; auth; vo['auth']){
foreach(i; vo; SELF) {
foreach(j; auth; vo['auth']) {
simple_user = matches(auth['user'], '^\.(\S+)$');
if(length(simple_user) > 1 ){
if (length(simple_user) > 1) {
auth['user'] = simple_user[1];
};
};
foreach(j; role; vo['voms']){
foreach(j; role; vo['voms']) {
simple_role = matches(role['user'], '^\.(\S+)$');
if(length(simple_role) > 1 ){
if (length(simple_role) > 1) {
role['user'] = simple_role[1];
};
};
Expand Down
6 changes: 3 additions & 3 deletions personality/se_dpm/puppet/puppetconf.pan
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ variable DPM_HEAD_LOG_LEVEL ?= DPM_LOG_LEVEL;
'/software/components/puppet/modules' ?= dict();

'/software/components/puppet/modules' = {
if(DPM_PUPPET_MODULE != 'NONE'){
if (DPM_PUPPET_MODULE != 'NONE') {
SELF[escape(DPM_PUPPET_MODULE)] = dict('version', DPM_PUPPET_MODULE_VERSION);
};
SELF;
Expand All @@ -47,7 +47,7 @@ prefix '/software/components/puppet/hieradata';
'{dpm::params::dpmmgr_gid}' = DPMMGR_GID;
'{dmlite::disk::log_level}' = DPM_DISK_LOG_LEVEL;
'{dmlite::head::log_level}' = DPM_HEAD_LOG_LEVEL;
'{dpm::params::host_dn}' = if(is_defined(DPM_HOST_DN)) DPM_HOST_DN else null;
'{dpm::params::host_dn}' = if (is_defined(DPM_HOST_DN)) DPM_HOST_DN else null;

# supported vos
'{dpm::params::volist}' = VOS;
Expand Down Expand Up @@ -81,5 +81,5 @@ prefix '/software/components/puppet/hieradata';
'{dpm::params::new_installation}' = 'no';
'{fetchcrl::manage_carepo}' = 'no';
'{fetchcrl::runboot}' = 'no';
'{fetchcrl::capkgs}' = if(is_defined(FETCHCRL_CAPKGS)) FETCHCRL_CAPKGS else null;
'{fetchcrl::capkgs}' = if (is_defined(FETCHCRL_CAPKGS)) FETCHCRL_CAPKGS else null;

4 changes: 2 additions & 2 deletions personality/se_dpm/service_puppet.pan
View file
Open in desktop
Expand Up @@ -32,8 +32,8 @@ include 'personality/se_dpm/puppet/puppetconf';
include 'personality/se_dpm/rpms/config';

'/software/packages' = {
if (SEDPM_IS_HEAD_NODE){
if (match(OS_VERSION_PARAMS['major'], '[es]l[56]')){
if (SEDPM_IS_HEAD_NODE) {
if (match(OS_VERSION_PARAMS['major'], '[es]l[56]')) {
pkg_repl('mysql-server');
} else {
pkg_repl('mariadb-server');
Expand Down