Merge branch 'production' into IT-5489_rucio_puppet_2

Author: dtapiacl

Puppetfile

@@ -8,115 +8,117 @@ mod 'ccin2p3/mit_krb5', git: 'https://github.com/lsst-it/puppet-mit_krb5.git', r
 mod 'cirrax/libvirt', '5.0.5'
 mod 'duritong/sysctl', git: 'https://github.com/duritong/puppet-sysctl', ref: '847ec1c'  # migrate to herculesteam/augeasproviders_sysctl; https://github.com/duritong/puppet-sysctl/pull/48
 mod 'jamtur01/httpauth', '0.0.6'
-mod 'jcpunk/irqbalance', '1.0.6'
+mod 'jcpunk/irqbalance', '1.0.7'
 mod 'jhoblitt/ipmi', '6.1.0'
 mod 'lsst/anaconda', '0.1.0'
 mod 'lsst/ccs_daq', '1.1.0'
 mod 'lsst/ccs_database', '3.5.0'
-mod 'lsst/ccs_hcu', '3.5.0'
-mod 'lsst/ccs_monit', '2.2.2'
+mod 'lsst/ccs_hcu', '3.7.1'
+mod 'lsst/ccs_monit', '2.2.3'
 mod 'lsst/ccs_mrtg', '1.6.0'
-mod 'lsst/ccs_sal', '2.8.1'
-mod 'lsst/ccs_software', '2.7.0'
-mod 'lsst/cni', '3.4.0'
-mod 'lsst/daq', '2.5.0'
+mod 'lsst/ccs_sal', '2.11.0'
+mod 'lsst/ccs_software', '2.9.0'
+mod 'lsst/cni', '3.5.0'
+mod 'lsst/daq', '2.6.0'
 mod 'lsst/dellperc', '2.0.0'
 mod 'lsst/foreman_envsync', '2.1.0'
 mod 'lsst/google_chrome', git: 'https://github.com/lsst-it/puppet-google-chrome', ref: '974a7b1'
 mod 'lsst/helm_binary', '3.0.0'
 mod 'lsst/htcondor', '0.2.0'
 mod 'lsst/ipa', git: 'https://github.com/lsst-it/puppet-ipa', ref: '37eb701'
-mod 'lsst/java_artisanal', '3.4.0'
+mod 'lsst/java_artisanal', '3.4.1'
 mod 'lsst/kubectl', '1.2.0'
 mod 'lsst/maven', '3.1.0'
 mod 'lsst/nm', '0.3.0'
 mod 'lsst/pi', '1.0.0'
 mod 'lsst/powertop', '0.1.2'
 mod 'lsst/rke', '2.1.0'
 mod 'lsst/rke2', '2.0.0'
-mod 'lsst/smee', '2.3.0'
-mod 'puppet/alternatives', '5.1.0'
+mod 'lsst/s3daemon', '1.2.0'
+mod 'lsst/smee', '2.4.0'
+mod 'puppet/alternatives', '6.0.0'
 mod 'puppet/archive', '7.1.0'
 mod 'puppet/augeas', '2.0.0'
 mod 'puppet/augeasproviders_apache', '5.0.0'
 mod 'puppet/augeasproviders_core', '4.1.0'
 mod 'puppet/augeasproviders_grub', '5.1.2'
 mod 'puppet/augeasproviders_shellvar', '6.0.1'
 mod 'puppet/chrony', '3.0.0'
-mod 'puppet/cron', '4.2.0'
+mod 'puppet/cron', '5.0.0'
 mod 'puppet/epel', '5.0.0'
-mod 'puppet/extlib', '7.2.0'
+mod 'puppet/extlib', '7.4.0'
 mod 'puppet/hosts', '0.1.0'
 mod 'puppet/ipset', '4.3.0'
-mod 'puppet/kmod', '4.0.1'
-mod 'puppetlabs/accounts', '8.2.1'
-mod 'puppetlabs/apache', '12.1.0'
+mod 'puppet/kmod', '4.1.0'
+mod 'puppetlabs/accounts', '8.2.2'
+mod 'puppetlabs/apache', '12.2.0'
 mod 'puppetlabs/apt', '9.4.0'
 mod 'puppetlabs/augeas_core', '1.5.0'
-mod 'puppetlabs/concat', '9.0.2'
+mod 'puppetlabs/concat', '9.1.0'
 mod 'puppetlabs/cron_core', '1.3.0'
-mod 'puppetlabs/docker', '10.0.1'
-mod 'puppetlabs/facts', '1.6.0'
-mod 'puppetlabs/firewall', '8.1.0'
+mod 'puppetlabs/docker', '10.1.0'
+mod 'puppetlabs/facts', '1.7.0'
+mod 'puppetlabs/firewall', '8.1.3'
 mod 'puppetlabs/host_core', '1.3.0'
-mod 'puppetlabs/inifile', '6.1.1'
-mod 'puppetlabs/java', '11.0.0'
+mod 'puppetlabs/inifile', '6.2.0'
+mod 'puppetlabs/java', '11.1.0'
 mod 'puppetlabs/k5login_core', '1.0.2'
 mod 'puppetlabs/mailalias_core', '1.2.0'
 mod 'puppetlabs/mount_core', '1.3.0'
-mod 'puppetlabs/mysql', '16.0.0'
-mod 'puppetlabs/ntp', '10.1.0'
-mod 'puppetlabs/postgresql', '10.3.0'
+mod 'puppetlabs/mysql', '16.2.0'
+mod 'puppetlabs/ntp', '11.0.0'
+mod 'puppetlabs/postgresql', '10.5.0'
 mod 'puppetlabs/puppet_agent', '4.21.0'
 mod 'puppetlabs/puppetdb', '8.1.0'
 mod 'puppetlabs/puppetserver_gem', '1.1.1'
-mod 'puppetlabs/reboot', '5.0.0'
+mod 'puppetlabs/reboot', '5.1.0'
 mod 'puppetlabs/selinux_core', '1.4.0'
 mod 'puppetlabs/sshkeys_core', '2.5.0'
-mod 'puppetlabs/stdlib', '9.6.0'
-mod 'puppetlabs/tomcat', '7.2.0'
+mod 'puppetlabs/stdlib', '9.7.0'
+mod 'puppetlabs/tomcat', '7.4.0'
 mod 'puppetlabs/transition', '2.0.0'
 mod 'puppetlabs/vcsrepo', '6.1.0'
 mod 'puppetlabs/xinetd', '3.4.1'
 mod 'puppetlabs/yumrepo_core', '2.1.0'
 mod 'puppet/letsencrypt', '11.1.0'
-mod 'puppet/lldpd', '6.1.0'
-mod 'puppet/mosquitto', '2.1.1'
+mod 'puppet/lldpd', '7.0.0'
+mod 'puppet/mosquitto', '2.2.0'
 mod 'puppet/nfs', '3.0.0'
 mod 'puppet/nginx', '6.0.1'
-mod 'puppet/openldap', '8.0.0'
-mod 'puppet/postfix',  '4.4.0'
-mod 'puppet/prometheus', '15.0.0'
-mod 'puppet/python', '7.3.0'
-mod 'puppet/r10k', '13.0.0'
-mod 'puppet/redis', '11.0.0'
+mod 'puppet/openldap', '8.1.0'
+mod 'puppet/postfix',  '5.0.0'
+mod 'puppet/prometheus', '16.0.0'
+mod 'puppet/python', '7.4.0'
+mod 'puppet/quadlets', '1.1.0'
+mod 'puppet/r10k', '14.1.0'
+mod 'puppet/redis', '11.1.0'
 mod 'puppet/rsyslog', '7.1.0'
 mod 'puppet/selinux', '5.0.0'
 mod 'puppet/ssh_keygen', '6.0.0'
 mod 'puppet/sssd', '1.0.0'
 mod 'puppet/systemd', '7.1.0'
 mod 'puppet/tang', '0.2.0'
-mod 'puppet/tuned', '1.0.0'
-mod 'puppet/yum', '7.1.0'
+mod 'puppet/tuned', '1.1.0'
+mod 'puppet/yum', '7.2.0'
 mod 'richardc/datacat', '0.6.2'
 mod 'saz/resolv_conf', '7.0.0'
-mod 'saz/ssh', '12.1.0'
-mod 'saz/sudo', '8.0.0'
+mod 'saz/ssh', '13.0.0'
+mod 'saz/sudo', '9.0.0'
 mod 'saz/timezone', '7.0.0'
-mod 'simp/auditd', '8.14.3'
+mod 'simp/auditd', '8.14.4'
 mod 'simp/dconf', '0.5.0'
 mod 'simp/mate', '1.6.0'
 mod 'simp/polkit', '6.8.0'
 mod 'simp/simpkv', '0.13.0'
-mod 'simp/simplib', '4.12.2'
+mod 'simp/simplib', '4.14.0'
 mod 'stm/debconf', '6.1.0'
-mod 'syseleven/restic', '2.7.0'
+mod 'syseleven/restic', '2.8.1'
 mod 'theforeman/dhcp', '9.2.0'
-mod 'theforeman/dns', '11.0.0'
+mod 'theforeman/dns', '11.0.1'
 mod 'theforeman/foreman', git: 'https://github.com/lsst-it/puppet-foreman', ref: '59ed5a5'  # 20.2.0 + dep updates
 mod 'theforeman/foreman_proxy', git: 'https://github.com/lsst-it/puppet-foreman_proxy', ref: '90af64a'  # https://github.com/theforeman/puppet-foreman_proxy/pull/772 https://github.com/theforeman/puppet-foreman_proxy/pull/816
 mod 'theforeman/puppet', '20.0.0'
 mod 'theforeman/puppetserver_foreman', '4.0.0'
 mod 'theforeman/tftp', '9.1.0'
-mod 'treydock/clustershell', git: 'https://github.com/lsst-it/puppet-module-clustershell', ref: '4dbb8f5' # 3.0.0 + https://github.com/treydock/puppet-module-clustershell/pull/22
+mod 'treydock/clustershell', '4.0.0'
 mod 'treydock/perfsonar', git: 'https://github.com/lsst-it/puppet-module-perfsonar', ref: '1f36e12'  # 4.1.0 + https://github.com/treydock/puppet-module-perfsonar/pull/26

hieradata/cluster/amor/osfamily/RedHat/major/7.yaml

@@ -26,18 +26,22 @@ ccs_software::jdk8::package: "jdk1.8"
 ccs_software::jdk8::dir: "jdk1.8.0_202-amd64"
 ccs_software::jdk8::version: "2000:1.8.0_202-fcs"
 
-ccs_software::service_email: "auxtel-ccs-alerts-aaaadjkgtdl6pb2omvdi732xci@lsstc.slack.com"
+ccs_software::service_email: "auxtel-ccs-alerts-aaaaoikgy7stloxmg54kii7uwi@rubin-obs.slack.com"
 
 clustershell::groupmembers:
   misc: {group: "misc", member: "auxtel-mcm,auxtel-dc01,auxtel-fp01"}
-  hcu: {group: "hcu", member: "auxtel-hcu01,auxtel-hcu02"}
+  hcu: {group: "hcu", member: "auxtel-hcu01"}
   all: {group: "all", member: "@misc,@hcu"}
 
+ccs_database::database: "atsccsdb"
+
 ccs_monit::alert:
-  - "auxtel-ccs-alerts-aaaadjkgtdl6pb2omvdi732xci@lsstc.slack.com"
+  - "auxtel-ccs-alerts-aaaaoikgy7stloxmg54kii7uwi@rubin-obs.slack.com"
 
 java_artisanal::package: "jdk1.8"
 java_artisanal::dir: "jdk1.8.0_202-amd64"
+java_artisanal::set_alternatives: false
+java_artisanal::java17::set_alternatives: true
 
 accounts::group_list:
   lsstadm:
@@ -62,12 +66,9 @@ accounts::user_list:
 ccs_software::desktop: true
 ccs_software::env: "AuxTel"
 ccs_software::installations:
-  ats-software-2.3.11:
-    aliases:
-      - "puppet-2.3.11"
-  ats-software-39.0.0:
+  ats-software-40.0.0:
     aliases:
-      - "puppet-39.0.0"
+      - "puppet-40.0.0"
 
 ## Used in lookups:
 ccs_site: "summit"
@@ -78,12 +79,16 @@ ccs_daq::instrument: "%{lookup('ccs_instrument')}"
 ccs_sal::dds_domain: "%{lookup('ccs_site')}"
 ccs_sal::dds_interface: "auxtel-mcm-dds.cp.lsst.org"
 ccs_sal::instrument: "%{lookup('ccs_instrument')}"
+## Java 17
+ccs_sal::dds_extra: "export LD_PRELOAD=${JAVA_HOME}/lib/libjsig.so"
+ccs_sal::java_home: "/usr/lib/jvm/zulu-17"
 
 ccs_software::global_properties:
   - "org.lsst.ccs.lockservice=remote"
   - "org.lsst.ccs.subsystem.agent.property.instrument=%{lookup('ccs_instrument')}"
   - "org.lsst.ccs.subsystem.agent.property.cluster=%{lookup('ccs_instrument')}"
   - "org.lsst.ccs.subsystem.agent.property.site=%{lookup('ccs_site')}"
+  - "org.lsst.ccs.InfluxDb.default.tags=%{lookup('ccs_instrument')}|%{lookup('ccs_instrument')}-%{lookup('ccs_site')}"
 
 ccs_software::udp_properties:
   - "org.lsst.ccs.jgroups.LOG.UDP.mcast_port=26978"
@@ -92,11 +97,12 @@ ccs_software::udp_properties:
 
 ccs_sal::ospl_home: "/opt/OpenSpliceDDS/V6.10.4/HDE/x86_64.linux"
 ccs_sal::rpms:
-  ts_sal_utils: "ts_sal_utils-8.0.0-1.x86_64.rpm"
+  ts_sal_utils: "ts_sal_utils-9.0.0-1.x86_64.rpm"
 ccs_sal::rpms_private:
   OpenSpliceDDS: "OpenSpliceDDS-6.10.4-1.el8.x86_64.rpm"
 
 daq::daqsdk::purge: false
-daq::daqsdk::version: "R5-V8.1"
+daq::daqsdk::version: "R5-V12.1"
 
+profile::ccs::tomcat::java_home: "/usr/lib/jvm/zulu-17"
 profile::ccs::tomcat::trending_site: "%{lookup('ccs_instrument')}"

hieradata/cluster/auxtel-ccs.yaml

@@ -37,7 +37,7 @@ ccs_database::database: "comcamdbprod"
 
 ccs_sal::ospl_home: "/opt/OpenSpliceDDS/V6.10.4/HDE/x86_64.linux"
 ccs_sal::rpms:
-  ts_sal_utils: "ts_sal_utils-8.0.0-1.x86_64.rpm"
+  ts_sal_utils: "ts_sal_utils-9.0.0-1.x86_64.rpm"
 ccs_sal::rpms_private:
   OpenSpliceDDS: "OpenSpliceDDS-6.10.4-1.el8.x86_64.rpm"
 
@@ -59,13 +59,14 @@ ccs_software::global_properties:
   - "org.lsst.ccs.subsystem.agent.property.instrument=%{lookup('ccs_instrument')}"
   - "org.lsst.ccs.subsystem.agent.property.cluster=%{lookup('ccs_instrument')}"
   - "org.lsst.ccs.subsystem.agent.property.site=%{lookup('ccs_site')}"
+  - "org.lsst.ccs.InfluxDb.default.tags=%{lookup('ccs_instrument')}|%{lookup('ccs_instrument')}-%{lookup('ccs_site')}"
 
 ## comcam-alerts
-ccs_software::service_email: "x7z0x9c0t2k4r1n1@lsstc.slack.com"
+ccs_software::service_email: "comcam-alerts-aaaaoiphax6ggc2vzy5idxkmke@rubin-obs.slack.com"
 
 ccs_monit::alert:
   ## comcam-alerts
-  - "x7z0x9c0t2k4r1n1@lsstc.slack.com"
+  - "comcam-alerts-aaaaoiphax6ggc2vzy5idxkmke@rubin-obs.slack.com"
 
 ccs_mrtg::loss_host: "comcam-mcm"
 
@@ -97,16 +98,13 @@ accounts::user_list:
 ccs_software::desktop: true
 ccs_software::env: "ComCam"
 ccs_software::installations:
-  comcam-software-2.4.9:
+  comcam-software-40.0.0:
     aliases:
-      - "puppet-2.4.9"
-  comcam-software-39.0.0:
-    aliases:
-      - "puppet-39.0.0"
+      - "puppet-40.0.0"
 
 daq::daqsdk::purge: false
 
-daq::daqsdk::version: "R5-V8.1"
+daq::daqsdk::version: "R5-V12.1"
 
 profile::ccs::tomcat::java_home: "/usr/lib/jvm/zulu-17"
 profile::ccs::tomcat::rest_url: "comcam-db01:3306/comcamdbprod"

hieradata/cluster/comcam-ccs.yaml

@@ -80,6 +80,7 @@ nm::connections:
       bond:
         miimon: "100"
         mode: "802.3ad"
+        xmit_hash_policy: "layer3+4"
       ipv4:
         method: "disabled"
       ipv6:
@@ -100,6 +101,36 @@ nm::connections:
         id: "1801"
         parent: "bond0"
       bridge-port: {}
+  bond0.1802:
+    content:
+      connection:
+        id: "bond0.1802"
+        uuid: "8b2e41ce-ec67-4809-8f91-c2ffff165eb8"
+        type: "vlan"
+        interface-name: "bond0.1802"
+        master: "br1802"
+        slave-type: "bridge"
+      ethernet: {}
+      vlan:
+        flags: "1"
+        id: "1802"
+        parent: "bond0"
+      bridge-port: {}
+  bond0.1803:
+    content:
+      connection:
+        id: "bond0.1803"
+        uuid: "f8023063-3ece-4ea7-ba1e-d07053e788b2"
+        type: "vlan"
+        interface-name: "bond0.1803"
+        master: "br1803"
+        slave-type: "bridge"
+      ethernet: {}
+      vlan:
+        flags: "1"
+        id: "1803"
+        parent: "bond0"
+      bridge-port: {}
   br1801:
     content:
       connection:
@@ -115,3 +146,33 @@ nm::connections:
       ipv6:
         method: "disabled"
       proxy: {}
+  br1802:
+    content:
+      connection:
+        id: "br1802"
+        uuid: "6a6ec9f9-0378-447c-880e-55d1f65dcf09"
+        type: "bridge"
+        interface-name: "br1802"
+      ethernet: {}
+      bridge:
+        stp: "false"
+      ipv4:
+        method: "disabled"
+      ipv6:
+        method: "disabled"
+      proxy: {}
+  br1803:
+    content:
+      connection:
+        id: "br1803"
+        uuid: "26744673-4e9f-4454-94dc-6ce486e6376f"
+        type: "bridge"
+        interface-name: "br1803"
+      ethernet: {}
+      bridge:
+        stp: "false"
+      ipv4:
+        method: "disabled"
+      ipv6:
+        method: "disabled"
+      proxy: {}

hieradata/cluster/elqui.yaml

@@ -1,5 +1,6 @@
 ---
 classes:
+  - "profile::core::sysctl::lhn"
   - "profile::core::sysctl::rp_filter"
 profile::core::sysctl::rp_filter::enable: false
 rke2::config: