Merge pull request #123 from ARGOeu/devel

Version 1.8.1

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Release notes for argo-puppet module
 
+### 1.8.1 - 27 Jun 2024
+
+* AO-985 Include repo for HTCondor packages on Rocky 9
+* AO-983 Add nordugrid-arc-nagios-plugins-egi to Puppet configuration files regarding arc
+
 ### 1.8.0 - 17 Jun 2024
 
 * AO-972 Change argo-poem-tools.conf.erb template to work with the changes in the tool

files/mon/condor/htcondor.repo

@@ -0,0 +1,27 @@
+[htcondor]
+name=HTCondor for Enterprise Linux 9 - Release
+baseurl=https://research.cs.wisc.edu/htcondor/repo/10.x/el9/$basearch/release
+enabled=1
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key
+priority=90
+
+[htcondor-debuginfo]
+name=HTCondor for Enterprise Linux 9 - Release - Debug
+baseurl=https://research.cs.wisc.edu/htcondor/repo/10.x/el9/$basearch/release/debug
+enabled=0
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key
+priority=90
+
+[htcondor-source]
+name=HTCondor for Enterprise Linux 9 - Release - Source
+baseurl=https://research.cs.wisc.edu/htcondor/repo/10.x/el9/$basearch/release/SRPMS
+enabled=0
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key
+priority=90
+

manifests/mon/arc.pp

@@ -10,7 +10,7 @@
     mode   => '0644',
   }
 
-  package { ['nordugrid-arc-nagios-plugins', 'argo-probe-igtf', 'argo-probe-sensu']:
+  package { ['nordugrid-arc-nagios-plugins', 'nordugrid-arc-nagios-plugins-egi', 'argo-probe-igtf', 'argo-probe-sensu']:
   }
 
   file { '/etc/arc/nagios/90-local.ini':

manifests/mon/condor.pp

@@ -8,6 +8,13 @@
     group  => root,
     mode   => '0644',
   }
+
+  if (Integer($facts['os']['release']['major']) > 7) {
+    file { '/etc/yum.repos.d/htcondor.repo': 
+      source => 'puppet:///modules/argo/mon/condor/htcondor.repo',
+      mode   => '0644',
+    }
+  }
 
   package { 'condor': 
   }