Merge pull request #1095 from lsst-it/IT-5185/ccs-opensplice-el9

(ccs_sal) update list of required system rpms on el9
lsst-it · Apr 8, 2024 · b29f7d4 · b29f7d4
2 parents fee96a3 + 79b0f59
commit b29f7d4
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 13 deletions.
diff --git 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'

diff --git 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
diff --git a/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml b/hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml
@@ -1,3 +1,4 @@
 ---
-ccs_sal::rpms_private:
-  OpenSpliceDDS: "OpenSpliceDDS-6.10.4-1.el8.x86_64.rpm"
+ccs_sal::rpm_requirements:
+  - "linuxptp"
+  - "compat-openssl11"
diff --git 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
diff --git a/hieradata/cluster/comcam-ccs/osfamily/RedHat/major/9.yaml 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.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
@@ -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
diff --git a/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/9.yaml b/hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/9.yaml
@@ -0,0 +1,4 @@
+---
+ccs_sal::rpm_requirements:
+  - "linuxptp"
+  - "compat-openssl11"