Merge pull request #637 from lsst-it/IT-3057/ccs_updates

update ccs related puppet mods for EL8 support

Puppetfile

@@ -18,21 +18,20 @@ mod 'icinga/icingaweb2', '3.3.0'
 mod 'jamtur01/httpauth', '0.0.6'
 mod 'jcpunk/irqbalance', '1.0.2'
 mod 'jhoblitt/ipmi', '3.1.0'
-mod 'lsst/ccs_daq', '0.3.0'
-mod 'lsst/ccs_database', git: 'https://github.com/lsst-it/puppet-ccs_database', ref: 'v2.0.0'
-mod 'lsst/ccs_hcu', git: 'https://github.com/lsst-it/puppet-ccs_hcu', ref: 'v2.1.0'
-mod 'lsst/ccs_monit', git: 'https://github.com/lsst-it/puppet-ccs_monit', ref: 'v0.2.0'
-mod 'lsst/ccs_mrtg', git: 'https://github.com/lsst-it/puppet-ccs_mrtg', ref: 'v1.1.0'
-mod 'lsst/ccs_sal', git: 'https://github.com/lsst-it/puppet-ccs_sal', ref: 'v1.0.1'
-mod 'lsst/ccs_software', git: 'https://github.com/lsst-it/puppet-ccs_software', ref: 'v1.0.2'
+mod 'lsst/ccs_daq', '0.4.1'
+mod 'lsst/ccs_database', '2.1.2'
+mod 'lsst/ccs_hcu', '2.2.2'
+mod 'lsst/ccs_monit', '1.0.0'
+mod 'lsst/ccs_sal', '1.1.0'
+mod 'lsst/ccs_software', '1.1.3'
 mod 'lsst/cni', '2.2.0'
-mod 'lsst/daq', '1.0.0'
+mod 'lsst/daq', '1.1.0'
 mod 'lsst/dellperc', '1.1.0'
 mod 'lsst/helm_binary', '1.0.0'
 # Fork of ghoneycutt/hosts that includes https://github.com/ghoneycutt/puppet-module-hosts/pull/63
 mod 'lsst/hosts', git: 'https://github.com/lsst-it/puppet-module-hosts', ref: '528475e'
-mod 'lsst/java_artisanal', '2.2.1'
-mod 'lsst/maven', '2.0.1'
+mod 'lsst/java_artisanal', '2.2.2'
+mod 'lsst/maven', '2.0.2'
 mod 'lsst/rke', '1.1.0'
 mod 'lsst/tuned', git: 'https://github.com/lsst-it/puppet-tuned', branch: 'production'  # https://github.com/CERIT-SC/puppet-tuned/pull/21
 mod 'puppet/alternatives', '4.0.0'

hieradata/node/auxtel-fp01.cp.lsst.org.yaml

@@ -59,8 +59,6 @@ nfs::client_mounts:
     server: "%{facts.fqdn}"
     atboot: true
 
-ccs_monit::hwraid: false
-
 ccs_software::services:
   ## FIXME this should be changed to prod, and a local systemctl override
   ## used to get the dev version.

hieradata/node/comcam-dc01.cp.lsst.org.yaml

@@ -4,8 +4,6 @@ profile::daq::daq_interface::uuid: "faf763be-13a8-481b-9e3f-af5766581a41"
 profile::daq::daq_interface::was: "p3p1"
 profile::daq::daq_interface::mode: "dhcp-client"
 
-profile::ccs::facts::daq: false
-
 network::interfaces_hash:
   p1p1:  # fqdn
     bootproto: "dhcp"

hieradata/role/atsccs.yaml

@@ -11,8 +11,6 @@ classes:
 
 nfs::client_enabled: true
 
-ccs_monit::hwraid: false
-
 profile::core::systemd::tmpfile:
   docker_tmp.conf:  # XXX short term kludge
     content: "x /tmp/docker_tmp 0777 saluser saluser -"

hieradata/role/atsdaq.yaml

@@ -9,6 +9,5 @@ classes:
   - "profile::core::nfsserver"
   - "profile::daq::daq_interface"
 
-profile::ccs::facts::daq: true
 profile::ccs::krb5_token::user: "ccs-ipa"
 profile::ccs::krb5_token::uid: 72055

hieradata/role/atshcu.yaml

@@ -9,8 +9,6 @@ classes:
 packages:
   - "usbutils"
 
-ccs_monit::hwraid: false
-
 ccs_hcu::canbus::module: "advSocketCAN"
 ccs_hcu::canbus::version: "1.0.1.0"
 

hieradata/role/ccs-dc.yaml

@@ -5,5 +5,3 @@ classes:
   - "profile::core::common"
   - "profile::core::nfsclient"
   - "profile::daq::daq_interface"
-
-profile::ccs::facts::daq: true

hieradata/role/ccs-desktop.yaml

@@ -5,5 +5,3 @@ classes:
   - "profile::core::common"
 
 profile::ccs::graphical::officeapps: true
-
-ccs_monit::hwraid: false

hieradata/role/ccs-hcu.yaml

@@ -8,8 +8,6 @@ classes:
 packages:
   - "usbutils"
 
-ccs_monit::hwraid: false
-
 ccs_hcu::canbus::module: "advSocketCAN"
 ccs_hcu::canbus::version: "1.0.1.0"
 

hieradata/role/ccs-virt.yaml

@@ -2,5 +2,4 @@
 classes:
   - "profile::ccs::common"
   - "profile::core::common"
-ccs_monit::hwraid: false
 ccs_monit::network: false

hieradata/role/ccs-viswork.yaml

@@ -6,5 +6,3 @@ classes:
   - "profile::core::common"
 
 profile::ccs::graphical::officeapps: true
-
-ccs_monit::hwraid: false

hieradata/role/comcam-fp.yaml

@@ -11,6 +11,5 @@ classes:
   - "profile::core::nfsserver"
   - "profile::daq::daq_interface"
 
-profile::ccs::facts::daq: true
 profile::ccs::krb5_token::user: "ccs-ipa"
 profile::ccs::krb5_token::uid: 72055

hieradata/site/tu/cluster/auxtel-ccs.yaml

@@ -7,7 +7,6 @@ ccs_software::service_email: "tucson-teststand-aler-aaaae4zsdubhmm3n7mowaugr2y@l
 ccs_monit::alert:
   ## tucson-teststand-alerts
   - "tucson-teststand-aler-aaaae4zsdubhmm3n7mowaugr2y@lsstc.slack.com"
-ccs_monit::hwraid: false
 
 clustershell::groupmembers:
   all: {group: "all", member: "auxtel-fp01,auxtel-mcm"}

hieradata/site/tu/cluster/comcam-ccs.yaml

@@ -7,7 +7,6 @@ ccs_software::service_email: "tucson-teststand-aler-aaaae4zsdubhmm3n7mowaugr2y@l
 ccs_monit::alert:
   ## tucson-teststand-alerts
   - "tucson-teststand-aler-aaaae4zsdubhmm3n7mowaugr2y@lsstc.slack.com"
-ccs_monit::hwraid: false
 
 clustershell::groupmembers:
   all: {group: "all", member: "comcam-dc01,comcam-fp01,comcam-mcm"}

site/profile/manifests/ccs/common.pp

@@ -18,7 +18,6 @@
 ) {
   include clustershell
   include profile::ccs::cfs
-  include profile::ccs::facts
   include profile::ccs::home
   include profile::ccs::monitoring
   include profile::ccs::postfix

site/profile/manifests/ccs/monitoring.pp

@@ -1,5 +1,4 @@
 class profile::ccs::monitoring {
   ## These will be replaced by some other alerting/monitoring system.
   include ccs_monit
-  include ccs_mrtg
 }