Skip to content

Commit

Permalink
Merge pull request #132 from ARGOeu/devel
Browse files Browse the repository at this point in the history
Version 1.8.4
  • Loading branch information
themiszamani authored Nov 5, 2024
2 parents 44ada2a + a585a3b commit 7d162ef
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

Release notes for argo-puppet module

### 1.8.4 - 5 Nov 2024

* AO-1002 Disable IPv6 through ARGO Puppet module

### 1.8.3 - 24 Jul 2024

* AO-991 Add the staging env certificate to the bundle
Expand Down
29 changes: 23 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,29 @@ forge 'http://forge.puppetlabs.com'
# Forge | Puppet modules
mod 'puppet-cron', '2.0.0'
mod 'puppet-systemd', '3.10.0'
mod 'puppetlabs-stdlib', '8.2.0'
mod 'richardc-datacat', '0.6.2'
mod 'sensu-sensu', '5.8.0'
# GitHub Lutak Srce modules
#GitHub Lutak Srce modules
mod 'umd',
:git => 'https://github.com/lutak-srce/umd'
:git => 'https://github.com/lutak-srce/umd',
:ref => 'master'
mod 'yum',
:git => 'https://github.com/lutak-srce/yum'
:git => 'https://github.com/lutak-srce/yum',
:ref => 'master'
mod 'gridcert',
:git => 'https://github.com/lutak-srce/gridcert'
:git => 'https://github.com/lutak-srce/gridcert',
:ref => 'master'
mod 'sysctl',
:git => 'https://github.com/lutak-srce/sysctl',
:ref => 'master'
# ARGO module
# ARGO modules
mod 'argo',
:git => 'https://github.com/ARGOeu/argo-puppet'
:git => 'https://github.com/argo/argo-puppet',
:ref => 'master'
```

## Usage - configurations
Expand Down Expand Up @@ -244,6 +253,14 @@ argo::mon::robotcert::key : 'puppet:///private/robotcert/robotkey.pem'
argo::mon::robotcert::cert: 'puppet:///private/robotcert/robotcert.pem'
```

### Disabling IPv6

In case the IPv6 needs to be disabled on the server, it is necessary only to set parameter:

```yaml
argo::mon::disable_ipv6: true
```

### Custom setup for certain probes

#### HTCondorCE probes
Expand Down
5 changes: 5 additions & 0 deletions manifests/mon.pp
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@
$sensu = false,
$condor = false,
$arc = false,
$disable_ipv6 = false,
) {
include yum::repo::argo

if ($disable_ipv6) {
include argo::mon::disable_ipv6
}

if ($egi) {
include ::yum::repo::umd4
} else {
Expand Down
11 changes: 11 additions & 0 deletions manifests/mon/disable_ipv6.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class argo::mon::disable_ipv6 () {
sysctl { 'net.ipv6.conf.all.disable_ipv6' :
value => '1',
comment => 'Disable IPv6',
}

sysctl { 'net.ipv6.conf.default.disable_ipv6' :
value => '1',
comment => 'Disable IPv6',
}
}

0 comments on commit 7d162ef

Please sign in to comment.