Merge pull request #142 from ARGOeu/devel

Version 1.8.7

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Release notes for argo-puppet module
 
+### 1.8.7 - 14 Feb 2025
+
+* AO-1018 Include COPR repo in ARGO Puppet module
+* AO-1019 Update htcondor repo in ARGO Puppet module
+
 ### 1.8.6 - 3 Dec 2024
 
 * AO-1008 Include nordugrid-arc-plugins-arcrest in argo-puppet module

README.md

@@ -277,6 +277,20 @@ It is possible to override the configuration file, and it can be done by setting
 argo::mon::condor::local_config: puppet:///path/to/local_config/file
 ```
 
+It is possible to choose the version of condor you wish to have installed, in which case the proper `.repo` file is going to be created. It is set up in the yaml file like this:
+
+```yaml
+argo::mon::condor::version: '23.0'
+```
+
+If the version is not set explicitly, it is set to version `'10.x'` by default.
+
+It is also possible to disable the `htcondor.repo` by setting parameter `enable` to 0. By default it is enabled. Example of how to disable the repo:
+
+```yaml
+argo::mon::condor::enable: 0
+```
+
 #### ARC-CE probes
 
 For ARC-CE probes to work properly, besides the package providing the probes (`nordugrid-arc-nagios-plugins`), also packages `nordugrid-arc-nagios-plugins-egi`, `argo-probe-igtf` and `argo-probe-sensu` need to be additionally installed. There is also a configuration file that needs to be placed in proper directory (default file is `files/mon/egi/90-local.ini`). If The default file is sufficient, the `.yaml` file should simply contain:

files/mon/repos/copr.repo

@@ -0,0 +1,10 @@
+[copr]
+name=Copr repo for PyPI owned by @copr
+baseurl=https://download.copr.fedorainfracloud.org/results/@copr/PyPI/epel-9-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://download.copr.fedorainfracloud.org/results/@copr/PyPI/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1

manifests/mon.pp

@@ -12,6 +12,7 @@
 ) {
   include yum::repo::argo
   include ::yum::repo::igtf
+  include argo::mon::copr
 
   if ($disable_ipv6) {
     include argo::mon::disable_ipv6

manifests/mon/condor.pp

@@ -1,5 +1,7 @@
 class argo::mon::condor (
-  $local_config='puppet:///modules/argo/mon/condor/condor_config.local'
+  $local_config='puppet:///modules/argo/mon/condor/condor_config.local',
+  $version='10.x',
+  $enabled=1
 ) {
 
   File {
@@ -11,11 +13,11 @@
 
   if (Integer($facts['os']['release']['major']) > 7) {
     file { '/etc/yum.repos.d/htcondor.repo': 
-      source => 'puppet:///modules/argo/mon/condor/htcondor.repo',
+      content => template('argo/mon/condor/htcondor.repo.erb'),
       mode   => '0644',
     }
   }
-
+    
   package { 'condor': 
   }
 

manifests/mon/copr.pp

@@ -0,0 +1,16 @@
+class argo::mon::copr () {
+
+  File {
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => '0644',
+  }
+
+  if (Integer($facts['os']['release']['major']) > 7) {
+    file { '/etc/yum.repos.d/copr.repo': 
+      source => 'puppet:///modules/argo/mon/repos/copr.repo',
+    }
+  }
+
+}

files/mon/condor/htcondor.repo → templates/mon/condor/htcondor.repo.erb

@@ -1,27 +1,26 @@
 [htcondor]
 name=HTCondor for Enterprise Linux 9 - Release
-baseurl=https://research.cs.wisc.edu/htcondor/repo/10.x/el9/$basearch/release
-enabled=1
+baseurl=https://research.cs.wisc.edu/htcondor/repo/<%= @version  %>/el9/$basearch/release
+enabled=<%= @enabled %>
 gpgcheck=1
 repo_gpgcheck=1
-gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-<%= @version  %>-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
+baseurl=https://research.cs.wisc.edu/htcondor/repo/<%= @version  %>/el9/$basearch/release/debug
 enabled=0
 gpgcheck=1
 repo_gpgcheck=1
-gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-<%= @version  %>-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
+baseurl=https://research.cs.wisc.edu/htcondor/repo/<%= @version  %>/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
-
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-<%= @version  %>-Key
+priority=90