From f7829cee3b6942067c33612e7985b7499a078293 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 29 May 2024 14:13:04 -0700 Subject: [PATCH] (cluster/comcam-ccs) switch to java17 This removes a tu site-specific setting. --- hieradata/cluster/comcam-ccs.yaml | 2 ++ hieradata/site/tu/cluster/comcam-ccs.yaml | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hieradata/cluster/comcam-ccs.yaml b/hieradata/cluster/comcam-ccs.yaml index af7e1e519d..a21c05e51b 100644 --- a/hieradata/cluster/comcam-ccs.yaml +++ b/hieradata/cluster/comcam-ccs.yaml @@ -67,6 +67,8 @@ ccs_monit::alert: 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: diff --git a/hieradata/site/tu/cluster/comcam-ccs.yaml b/hieradata/site/tu/cluster/comcam-ccs.yaml index 3cb30985be..e795d2f034 100644 --- a/hieradata/site/tu/cluster/comcam-ccs.yaml +++ b/hieradata/site/tu/cluster/comcam-ccs.yaml @@ -11,7 +11,4 @@ ccs_monit::alert: clustershell::groupmembers: all: {group: "all", member: "comcam-dc01,comcam-fp01,comcam-mcm"} -java_artisanal::set_alternatives: false -java_artisanal::java17::set_alternatives: true - postfix::relayhost: "[mail.lsst.org]:submission"