From 7ae9974df9f6dbdbcf7bd14d03d9f9b82e80b075 Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Wed, 13 Mar 2013 08:40:57 +0000 Subject: [PATCH 1/3] Add small snippet of documentation how to add manager user to database --- ldap/README | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 ldap/README diff --git a/ldap/README b/ldap/README new file mode 100644 index 0000000..f7a595e --- /dev/null +++ b/ldap/README @@ -0,0 +1,17 @@ + +Add manager user to database "dc=example,dc=com": + +# service slapd stop && su -s /bin/bash -l ldap && service slapd start +$ cat >manager.ldif +# Organizational Role for Directory Manager +dn: cn=Manager,dc=example,dc=com +objectClass: organizationalRole +objectClass: simpleSecurityObject +cn: Manager +description: Directory Manager +userPassword: {SSHA}rvdm3JYMhnIJgqhYkHyI6N8fHPEhx7ki +^D +$ slapadd -f /etc/openldap/slapd.conf -b "dc=example,dc=com" -f manager.ldif +$ slapindex -f /etc/openldap/slapd.conf +$ exit +# From b5fd8230185fe92e9826d058fcd661102fc637aa Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Wed, 27 Mar 2013 07:47:24 +0000 Subject: [PATCH 2/3] Fix check for srvadmin service --- dell/manifests/init.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dell/manifests/init.pp b/dell/manifests/init.pp index 657bc9d..454dad0 100644 --- a/dell/manifests/init.pp +++ b/dell/manifests/init.pp @@ -23,8 +23,9 @@ class dell::idrac7 { # Enable OpenManage System services exec { "srvadmin-service-enable": + path => "/bin:/sbin", command => "/opt/dell/srvadmin/sbin/srvadmin-services.sh enable", - creates => "/etc/rc2.d/S97dataeng", + unless => "chkconfig --list dataeng | grep 3:on >/dev/null", user => "root", group => "root", require => Exec["srvadmin-service-start"], From 68fb20296769852b6a2bb8a3373a5d822068e455 Mon Sep 17 00:00:00 2001 From: Ossi Herrala Date: Wed, 27 Mar 2013 07:48:11 +0000 Subject: [PATCH 3/3] More whitespace for a bit more clarity --- dell/manifests/init.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dell/manifests/init.pp b/dell/manifests/init.pp index 454dad0..9aa86e4 100644 --- a/dell/manifests/init.pp +++ b/dell/manifests/init.pp @@ -17,26 +17,26 @@ class dell::idrac7 { include dell::common package { 'srvadmin-idrac7': - ensure => installed, + ensure => installed, require => Class["yum::repo::dell"], } # Enable OpenManage System services exec { "srvadmin-service-enable": - path => "/bin:/sbin", + path => "/bin:/sbin", command => "/opt/dell/srvadmin/sbin/srvadmin-services.sh enable", - unless => "chkconfig --list dataeng | grep 3:on >/dev/null", - user => "root", - group => "root", + unless => "chkconfig --list dataeng | grep 3:on >/dev/null", + user => "root", + group => "root", require => Exec["srvadmin-service-start"], } # Start OpenManage System services exec { "srvadmin-service-start": command => "/opt/dell/srvadmin/sbin/srvadmin-services.sh start", - unless => "/usr/bin/pgrep -f /opt/dell/srvadmin/sbin/dsm_sa_datamgrd", - user => "root", - group => "root", + unless => "/usr/bin/pgrep -f /opt/dell/srvadmin/sbin/dsm_sa_datamgrd", + user => "root", + group => "root", require => Package["srvadmin-idrac7"], } }