From d80434762bc5f180d54d01745236931a4d9757cc Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 20 Mar 2024 14:54:41 -0700 Subject: [PATCH 1/5] (cluster/auxtel-ccs) simplify specification of opensplice rpm Since el8 and el9 are using the same version, make that the default, and just special-case el7. --- hieradata/cluster/auxtel-ccs.yaml | 2 ++ hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/8.yaml | 3 --- hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/8.yaml delete mode 100644 hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml diff --git a/hieradata/cluster/auxtel-ccs.yaml b/hieradata/cluster/auxtel-ccs.yaml index 17882d6c00..4e899c4576 100644 --- a/hieradata/cluster/auxtel-ccs.yaml +++ b/hieradata/cluster/auxtel-ccs.yaml @@ -110,6 +110,8 @@ 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-7.4.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" diff --git a/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/8.yaml b/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/8.yaml deleted file mode 100644 index b71b34948e..0000000000 --- a/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -ccs_sal::rpms_private: - OpenSpliceDDS: "OpenSpliceDDS-6.10.4-1.el8.x86_64.rpm" diff --git a/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml b/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml deleted file mode 100644 index b71b34948e..0000000000 --- a/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -ccs_sal::rpms_private: - OpenSpliceDDS: "OpenSpliceDDS-6.10.4-1.el8.x86_64.rpm" From dda302fc0edd76efeca1579c375e905137b49fad Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 20 Mar 2024 14:57:31 -0700 Subject: [PATCH 2/5] (cluster/comcam-ccs) simplify specification of opensplice rpm Since el8 and el9 are using the same version, make that the default, and just special-case el7. --- hieradata/cluster/comcam-ccs.yaml | 2 ++ hieradata/cluster/comcam-ccs/osfamily/RedHat/major/8.yaml | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 hieradata/cluster/comcam-ccs/osfamily/RedHat/major/8.yaml diff --git a/hieradata/cluster/comcam-ccs.yaml b/hieradata/cluster/comcam-ccs.yaml index f0d2272ca0..d2ae887296 100644 --- a/hieradata/cluster/comcam-ccs.yaml +++ b/hieradata/cluster/comcam-ccs.yaml @@ -38,6 +38,8 @@ 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-7.4.0-1.x86_64.rpm" +ccs_sal::rpms_private: + OpenSpliceDDS: "OpenSpliceDDS-6.10.4-1.el8.x86_64.rpm" ## Used in lookups: ccs_site: "summit" diff --git a/hieradata/cluster/comcam-ccs/osfamily/RedHat/major/8.yaml b/hieradata/cluster/comcam-ccs/osfamily/RedHat/major/8.yaml deleted file mode 100644 index b71b34948e..0000000000 --- a/hieradata/cluster/comcam-ccs/osfamily/RedHat/major/8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -ccs_sal::rpms_private: - OpenSpliceDDS: "OpenSpliceDDS-6.10.4-1.el8.x86_64.rpm" From b2d95d55fa1a0f8533a88fe599fc26db33bd539b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 20 Mar 2024 14:59:18 -0700 Subject: [PATCH 3/5] (cluster/lsstcam-ccs) simplify specification of opensplice rpm Since el8 and el9 are using the same version, make that the default, and just special-case el7. --- hieradata/cluster/lsstcam-ccs.yaml | 2 +- hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/7.yaml | 3 +++ hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/8.yaml | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/8.yaml diff --git a/hieradata/cluster/lsstcam-ccs.yaml b/hieradata/cluster/lsstcam-ccs.yaml index 05e6309ed2..b5c849e901 100644 --- a/hieradata/cluster/lsstcam-ccs.yaml +++ b/hieradata/cluster/lsstcam-ccs.yaml @@ -28,7 +28,7 @@ ccs_sal::prefix_service: false ccs_sal::rpms: ts_sal_utils: "ts_sal_utils-7.4.0-1.x86_64.rpm" ccs_sal::rpms_private: - OpenSpliceDDS: "OpenSpliceDDS-6.10.4-6.el7.x86_64.rpm" + OpenSpliceDDS: "OpenSpliceDDS-6.10.4-1.el8.x86_64.rpm" ## Used in lookups: ccs_site: "summit" diff --git a/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/7.yaml b/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/7.yaml index 1522b74fcd..613a2c4108 100644 --- a/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/7.yaml +++ b/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/7.yaml @@ -2,3 +2,6 @@ packages: - "devtoolset-8" - "rh-git218" + +ccs_sal::rpms_private: + OpenSpliceDDS: "OpenSpliceDDS-6.10.4-6.el7.x86_64.rpm" diff --git a/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/8.yaml b/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/8.yaml deleted file mode 100644 index b71b34948e..0000000000 --- a/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/8.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -ccs_sal::rpms_private: - OpenSpliceDDS: "OpenSpliceDDS-6.10.4-1.el8.x86_64.rpm" From f3c3500ca77bff67047594d1fb66079db079a260 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 20 Mar 2024 15:01:09 -0700 Subject: [PATCH 4/5] (Puppetfile) bump ccs_sal version to 2.3.0 This adds kafka support, and the option to specify rpm requirements. --- Puppetfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Puppetfile b/Puppetfile index 0bd13924b6..ead14504c1 100644 --- a/Puppetfile +++ b/Puppetfile @@ -17,7 +17,7 @@ mod 'lsst/ccs_daq', '1.1.0' mod 'lsst/ccs_database', '3.1.0' mod 'lsst/ccs_hcu', '3.1.2' mod 'lsst/ccs_monit', '2.2.1' -mod 'lsst/ccs_sal', '2.2.3' +mod 'lsst/ccs_sal', '2.3.0' mod 'lsst/ccs_software', '2.2.1' mod 'lsst/cni', '3.2.0' mod 'lsst/daq', '2.3.0' From 79b0f59e3a5be1cfa161751a1b2d5745b702f36d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 20 Mar 2024 15:04:11 -0700 Subject: [PATCH 5/5] (ccs_sal) add compat-openssl11 to required rpms on el9 --- hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml | 4 ++++ hieradata/cluster/comcam-ccs/osfamily/RedHat/major/9.yaml | 4 ++++ hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/9.yaml | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml create mode 100644 hieradata/cluster/comcam-ccs/osfamily/RedHat/major/9.yaml create mode 100644 hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/9.yaml diff --git a/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml b/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml new file mode 100644 index 0000000000..216c1515a1 --- /dev/null +++ b/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml @@ -0,0 +1,4 @@ +--- +ccs_sal::rpm_requirements: + - "linuxptp" + - "compat-openssl11" diff --git a/hieradata/cluster/comcam-ccs/osfamily/RedHat/major/9.yaml b/hieradata/cluster/comcam-ccs/osfamily/RedHat/major/9.yaml new file mode 100644 index 0000000000..216c1515a1 --- /dev/null +++ b/hieradata/cluster/comcam-ccs/osfamily/RedHat/major/9.yaml @@ -0,0 +1,4 @@ +--- +ccs_sal::rpm_requirements: + - "linuxptp" + - "compat-openssl11" diff --git a/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/9.yaml b/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/9.yaml new file mode 100644 index 0000000000..216c1515a1 --- /dev/null +++ b/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/9.yaml @@ -0,0 +1,4 @@ +--- +ccs_sal::rpm_requirements: + - "linuxptp" + - "compat-openssl11"