From dfa532c1e3c5c3e84efab1b5b1bd2b6674fde134 Mon Sep 17 00:00:00 2001 From: Mick Timony Date: Thu, 3 Oct 2024 12:58:49 -0400 Subject: [PATCH 1/6] only install the dell-system-update package on el-7/el-8, it does not exist in el-9/rhel-9 --- manifests/install.pp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index 1c8b2ff..92c4b5b 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -3,8 +3,11 @@ $package_version = $::dsu::package_version, ) { - package {$package_name: - ensure => $package_version, - require => Class['::dsu::repo'], + + if $::operatingsystemmajrelease in ['7','8'] { + package {$package_name: + ensure => $package_version, + require => Class['::dsu::repo'], + } } } From d97470eee0b93683f7e51661861c967e20033712 Mon Sep 17 00:00:00 2001 From: Mick Timony Date: Tue, 3 Dec 2024 16:14:11 -0500 Subject: [PATCH 2/6] diff package list for rhel9 than for el7/8. add `srvadmin_packages_no_java_rhel_9` and use that to install on any hosts that are NOT el7 or el8. --- manifests/params.pp | 7 +++++++ manifests/srvadmin/install.pp | 10 ++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 8126ea5..0021d8b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -15,6 +15,13 @@ 'srvadmin-standardAgent', 'srvadmin-storage', 'srvadmin-storage-cli', 'srvadmin-storage-snmp', 'srvadmin-storageservices', 'srvadmin-storageservices-cli', 'srvadmin-storageservices-snmp', 'srvadmin-storelib', 'srvadmin-storelib-sysfs', 'srvadmin-sysfsutils', 'srvadmin-xmlsup',] + $srvadmin_packages_no_java_rhel_9 = ['srvadmin-base', 'srvadmin-deng', 'srvadmin-deng-snmp', 'srvadmin-hapi', + 'srvadmin-idrac', 'srvadmin-isvc', 'srvadmin-isvc-snmp', 'srvadmin-itunnelprovider', 'srvadmin-marvellib', + 'srvadmin-nvme', 'srvadmin-omacore', 'srvadmin-omacs', 'srvadmin-omaksmig', 'srvadmin-omcommon', 'srvadmin-omilcore', 'srvadmin-ominst', + 'srvadmin-oslog', 'srvadmin-realssd', 'srvadmin-server-cli', 'srvadmin-server-snmp', 'srvadmin-smcommon', 'srvadmin-smweb', + 'srvadmin-standardAgent', 'srvadmin-storage', 'srvadmin-storage-cli', 'srvadmin-storage-snmp', 'srvadmin-storageservices', + 'srvadmin-storageservices-cli', 'srvadmin-storageservices-snmp', 'srvadmin-storelib', 'srvadmin-storelib-sysfs', 'srvadmin-sysfsutils', + 'srvadmin-xmlsup',] $srvadmin_version = 'latest' $srvadmin_services = ['dsm_sa_eventmgrd','dsm_sa_datamgrd','dsm_sa_snmpd','dsm_om_shrsvc','instsvcdrv'] $srvadmin_services_enable = true diff --git a/manifests/srvadmin/install.pp b/manifests/srvadmin/install.pp index 548c7d4..3ec676d 100644 --- a/manifests/srvadmin/install.pp +++ b/manifests/srvadmin/install.pp @@ -3,6 +3,7 @@ $srvadmin_package = $::dsu::srvadmin_package, $srvadmin_packages_java = $::dsu::srvadmin_packages_java, $srvadmin_packages_no_java = $::dsu::srvadmin_packages_no_java, + $srvadmin_packages_no_java_rhel_9 = $::dsu::srvadmin_packages_no_java_rhel_9, $srvadmin_version = $::dsu::srvadmin_version, $srvadmin_services = $::dsu::srvadmin_services, $srvadmin_java = 'srvadmin-jre', @@ -20,8 +21,13 @@ else { notify{"srvadmin_packages: will install multiple packages":} include ::dsu::repo - #Install select dell packages from packages Array - ensure_packages ($srvadmin_packages_no_java, {ensure => present}) + if $::operatingsystemmajrelease in ['7','8'] { + #Install select dell packages from packages Array + ensure_packages ($srvadmin_packages_no_java, {ensure => present}) + } + else{ + ensure_packages ($srvadmin_packages_no_java_rhel_9, {ensure => present}) + } notify{"srvadmin_packages: installed multiple packages: ${srvadmin_packages}":} # If installed this will uninstall srvadmin-jre, -tomcat, -wenbserver, -all ensure_packages ($srvadmin_packages_java, {ensure => absent}) From 17070716e6ea7bb19dbb16ade94bff5813884a43 Mon Sep 17 00:00:00 2001 From: Mick Timony Date: Fri, 21 Mar 2025 17:00:12 -0400 Subject: [PATCH 3/6] update formatting --- manifests/srvadmin/install.pp | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/manifests/srvadmin/install.pp b/manifests/srvadmin/install.pp index 3ec676d..4ec6247 100644 --- a/manifests/srvadmin/install.pp +++ b/manifests/srvadmin/install.pp @@ -7,29 +7,29 @@ $srvadmin_version = $::dsu::srvadmin_version, $srvadmin_services = $::dsu::srvadmin_services, $srvadmin_java = 'srvadmin-jre', - ) { - notify{"start installing srvadmin packages, services: ${srvadmin_services}":} - notify{"Limit selection boolean: ${srvadmin_install_limited}:${::dsu::srvadmin_install_limited}, all packages boolean: ${srvadmin_install_all}, single package list: ${$srvadmin_package}":} - if $srvadmin_install_all == true { - notify{"srvadmin_package: install single meta package":} - package { - $srvadmin_package: - ensure => $srvadmin_version, - require => Class['::dsu::repo'], - } +) { + notify { "start installing srvadmin packages, services: ${srvadmin_services}": } + notify { "Limit selection boolean: ${srvadmin_install_limited}:${::dsu::srvadmin_install_limited}, all packages boolean: ${srvadmin_install_all}, single package list: ${$srvadmin_package}": } + if $srvadmin_install_all == true { + notify { 'srvadmin_package: install single meta package': } + package { + $srvadmin_package: + ensure => $srvadmin_version, + require => Class['::dsu::repo'], + } + } + else { + notify { 'srvadmin_packages: will install multiple packages': } + include ::dsu::repo + if $::operatingsystemmajrelease in ['7','8'] { + #Install select dell packages from packages Array + ensure_packages ($srvadmin_packages_no_java, { ensure => present }) } else { - notify{"srvadmin_packages: will install multiple packages":} - include ::dsu::repo - if $::operatingsystemmajrelease in ['7','8'] { - #Install select dell packages from packages Array - ensure_packages ($srvadmin_packages_no_java, {ensure => present}) - } - else{ - ensure_packages ($srvadmin_packages_no_java_rhel_9, {ensure => present}) - } - notify{"srvadmin_packages: installed multiple packages: ${srvadmin_packages}":} - # If installed this will uninstall srvadmin-jre, -tomcat, -wenbserver, -all - ensure_packages ($srvadmin_packages_java, {ensure => absent}) + ensure_packages ($srvadmin_packages_no_java_rhel_9, { ensure => present }) } + notify { 'srvadmin_packages: installed multiple packages': } + # If installed this will uninstall srvadmin-jre, -tomcat, -wenbserver, -all + ensure_packages ($srvadmin_packages_java, { ensure => absent }) + } } From ee4ae5ac709d2cf85e3e70cf8e0a3eab5081f121 Mon Sep 17 00:00:00 2001 From: Mick Timony Date: Fri, 21 Mar 2025 17:24:52 -0400 Subject: [PATCH 4/6] update rhel9 packages list to only instlal the racadm toolset --- manifests/params.pp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 0021d8b..2137fbb 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -14,14 +14,8 @@ 'srvadmin-oslog', 'srvadmin-realssd', 'srvadmin-server-cli', 'srvadmin-server-snmp', 'srvadmin-smcommon', 'srvadmin-smweb', 'srvadmin-standardAgent', 'srvadmin-storage', 'srvadmin-storage-cli', 'srvadmin-storage-snmp', 'srvadmin-storageservices', 'srvadmin-storageservices-cli', 'srvadmin-storageservices-snmp', 'srvadmin-storelib', 'srvadmin-storelib-sysfs', 'srvadmin-sysfsutils', - 'srvadmin-xmlsup',] - $srvadmin_packages_no_java_rhel_9 = ['srvadmin-base', 'srvadmin-deng', 'srvadmin-deng-snmp', 'srvadmin-hapi', - 'srvadmin-idrac', 'srvadmin-isvc', 'srvadmin-isvc-snmp', 'srvadmin-itunnelprovider', 'srvadmin-marvellib', - 'srvadmin-nvme', 'srvadmin-omacore', 'srvadmin-omacs', 'srvadmin-omaksmig', 'srvadmin-omcommon', 'srvadmin-omilcore', 'srvadmin-ominst', - 'srvadmin-oslog', 'srvadmin-realssd', 'srvadmin-server-cli', 'srvadmin-server-snmp', 'srvadmin-smcommon', 'srvadmin-smweb', - 'srvadmin-standardAgent', 'srvadmin-storage', 'srvadmin-storage-cli', 'srvadmin-storage-snmp', 'srvadmin-storageservices', - 'srvadmin-storageservices-cli', 'srvadmin-storageservices-snmp', 'srvadmin-storelib', 'srvadmin-storelib-sysfs', 'srvadmin-sysfsutils', - 'srvadmin-xmlsup',] + 'srvadmin-xmlsup',] + $srvadmin_packages_no_java_rhel_9 = ['srvadmin-argtable2', 'srvadmin-hapi', 'srvadmin-idracadm7'] $srvadmin_version = 'latest' $srvadmin_services = ['dsm_sa_eventmgrd','dsm_sa_datamgrd','dsm_sa_snmpd','dsm_om_shrsvc','instsvcdrv'] $srvadmin_services_enable = true From 0f95fff60856f5e86db1c19303129b6206315c26 Mon Sep 17 00:00:00 2001 From: Mick Timony Date: Tue, 26 Aug 2025 15:44:08 -0400 Subject: [PATCH 5/6] install more del srv packages and this will all the daemons listing in srvadmin_services to abe started --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 2137fbb..f90724e 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -15,7 +15,7 @@ 'srvadmin-standardAgent', 'srvadmin-storage', 'srvadmin-storage-cli', 'srvadmin-storage-snmp', 'srvadmin-storageservices', 'srvadmin-storageservices-cli', 'srvadmin-storageservices-snmp', 'srvadmin-storelib', 'srvadmin-storelib-sysfs', 'srvadmin-sysfsutils', 'srvadmin-xmlsup',] - $srvadmin_packages_no_java_rhel_9 = ['srvadmin-argtable2', 'srvadmin-hapi', 'srvadmin-idracadm7'] + $srvadmin_packages_no_java_rhel_9 = ['srvadmin-argtable2', 'srvadmin-base', 'srvadmin-hapi', 'srvadmin-idrac', 'srvadmin-idracadm7', ' srvadmin-oslog', 'srvadmin-server-cli', 'srvadmin-storageservices'] $srvadmin_version = 'latest' $srvadmin_services = ['dsm_sa_eventmgrd','dsm_sa_datamgrd','dsm_sa_snmpd','dsm_om_shrsvc','instsvcdrv'] $srvadmin_services_enable = true From d7adb536b99ba1e5b281be1131d1acbbbaff9538 Mon Sep 17 00:00:00 2001 From: Mick Timony Date: Wed, 27 Aug 2025 10:26:13 -0400 Subject: [PATCH 6/6] remove white space causing package not to be installed ' srvadmin-oslog' vs 'srvadmin-oslog' --- manifests/params.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index f90724e..007f245 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -15,7 +15,7 @@ 'srvadmin-standardAgent', 'srvadmin-storage', 'srvadmin-storage-cli', 'srvadmin-storage-snmp', 'srvadmin-storageservices', 'srvadmin-storageservices-cli', 'srvadmin-storageservices-snmp', 'srvadmin-storelib', 'srvadmin-storelib-sysfs', 'srvadmin-sysfsutils', 'srvadmin-xmlsup',] - $srvadmin_packages_no_java_rhel_9 = ['srvadmin-argtable2', 'srvadmin-base', 'srvadmin-hapi', 'srvadmin-idrac', 'srvadmin-idracadm7', ' srvadmin-oslog', 'srvadmin-server-cli', 'srvadmin-storageservices'] + $srvadmin_packages_no_java_rhel_9 = ['srvadmin-argtable2', 'srvadmin-base', 'srvadmin-hapi', 'srvadmin-idrac', 'srvadmin-idracadm7', 'srvadmin-oslog', 'srvadmin-server-cli', 'srvadmin-storageservices'] $srvadmin_version = 'latest' $srvadmin_services = ['dsm_sa_eventmgrd','dsm_sa_datamgrd','dsm_sa_snmpd','dsm_om_shrsvc','instsvcdrv'] $srvadmin_services_enable = true