Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(ccs_sal) update list of required system rpms on el9 #1095

Merged
merged 5 commits into from
Apr 8, 2024
Merged

(ccs_sal) update list of required system rpms on el9 #1095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d804347
(cluster/auxtel-ccs) simplify specification of opensplice rpm
glennmorris Mar 20, 2024
dda302f
(cluster/comcam-ccs) simplify specification of opensplice rpm
glennmorris Mar 20, 2024
b2d95d5
(cluster/lsstcam-ccs) simplify specification of opensplice rpm
glennmorris Mar 20, 2024
f3c3500
(Puppetfile) bump ccs_sal version to 2.3.0
glennmorris Mar 20, 2024
79b0f59
(ccs_sal) add compat-openssl11 to required rpms on el9
glennmorris Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Puppetfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 2 additions & 0 deletions hieradata/cluster/auxtel-ccs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 0 additions & 3 deletions hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/8.yaml
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions hieradata/cluster/auxtel-ccs/osfamily/RedHat/major/9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 2 additions & 0 deletions hieradata/cluster/comcam-ccs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions hieradata/cluster/comcam-ccs/osfamily/RedHat/major/8.yaml
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions hieradata/cluster/comcam-ccs/osfamily/RedHat/major/9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
ccs_sal::rpm_requirements:
- "linuxptp"
- "compat-openssl11"
2 changes: 1 addition & 1 deletion hieradata/cluster/lsstcam-ccs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 3 additions & 0 deletions hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/7.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
packages:
- "devtoolset-8"
- "rh-git218"

ccs_sal::rpms_private:
OpenSpliceDDS: "OpenSpliceDDS-6.10.4-6.el7.x86_64.rpm"
3 changes: 0 additions & 3 deletions hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/8.yaml
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions hieradata/cluster/lsstcam-ccs/osfamily/RedHat/major/9.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
ccs_sal::rpm_requirements:
- "linuxptp"
- "compat-openssl11"
Loading