From f087e62374253ffba421f9b6b2712e960875a0e9 Mon Sep 17 00:00:00 2001 From: Diego Tapia <64498901+dtapia-IT@users.noreply.github.com> Date: Thu, 5 Dec 2024 17:47:56 -0300 Subject: [PATCH 1/2] (role/auxtelmcm) add ccs_database --- hieradata/role/auxtelmcm.yaml | 2 +- site/profile/manifests/core/auxtelmcm.pp | 14 -------------- spec/classes/core/auxtelmcm_spec.rb | 17 ----------------- spec/hosts/roles/auxtelmcm_spec.rb | 1 - spec/support/spec/auxtelmcm.rb | 13 ------------- 5 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 site/profile/manifests/core/auxtelmcm.pp delete mode 100644 spec/classes/core/auxtelmcm_spec.rb delete mode 100644 spec/support/spec/auxtelmcm.rb diff --git a/hieradata/role/auxtelmcm.yaml b/hieradata/role/auxtelmcm.yaml index 3b9ae9fafe..f97a47612c 100644 --- a/hieradata/role/auxtelmcm.yaml +++ b/hieradata/role/auxtelmcm.yaml @@ -1,9 +1,9 @@ --- classes: + - "ccs_database" - "ccs_sal" - "profile::ccs::common" - "profile::ccs::graphical" - - "profile::core::auxtelmcm" - "profile::core::common" - "profile::core::debugutils" diff --git a/site/profile/manifests/core/auxtelmcm.pp b/site/profile/manifests/core/auxtelmcm.pp deleted file mode 100644 index e89180b186..0000000000 --- a/site/profile/manifests/core/auxtelmcm.pp +++ /dev/null @@ -1,14 +0,0 @@ -# @summary -# Manages MariaDB package install on auxtel-mcm node. -# -class profile::core::auxtelmcm { - package { 'mariadb-server': - ensure => installed, - } - - service { 'mariadb': - ensure => running, - enable => true, - require => Package['mariadb-server'], - } -} diff --git a/spec/classes/core/auxtelmcm_spec.rb b/spec/classes/core/auxtelmcm_spec.rb deleted file mode 100644 index 572bf1608b..0000000000 --- a/spec/classes/core/auxtelmcm_spec.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -describe 'profile::core::auxtelmcm' do - on_supported_os.each do |os, os_facts| - next unless os =~ %r{almalinux-9-x86_64} - - context "on #{os}" do - let(:facts) { os_facts } - - it { is_expected.to compile.with_all_deps } - - include_examples 'auxtelmcm' - end - end -end diff --git a/spec/hosts/roles/auxtelmcm_spec.rb b/spec/hosts/roles/auxtelmcm_spec.rb index cc565d460d..d20456bb3b 100644 --- a/spec/hosts/roles/auxtelmcm_spec.rb +++ b/spec/hosts/roles/auxtelmcm_spec.rb @@ -22,7 +22,6 @@ include_examples('common', os_facts:, site:) include_examples('ccs common', os_facts:) - include_examples 'auxtelmcm' end # host end # lsst_sites end # on os diff --git a/spec/support/spec/auxtelmcm.rb b/spec/support/spec/auxtelmcm.rb deleted file mode 100644 index 069dd46966..0000000000 --- a/spec/support/spec/auxtelmcm.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -shared_examples 'auxtelmcm' do - it { is_expected.to contain_package('mariadb-server').with_ensure('installed') } - - it { - is_expected.to contain_service('mariadb').with( - ensure: 'running', - enable: true, - require: 'Package[mariadb-server]' - ) - } -end From 6023a88d602b24eb92804d152c2c79438aec6381 Mon Sep 17 00:00:00 2001 From: Diego Tapia <64498901+dtapia-IT@users.noreply.github.com> Date: Thu, 5 Dec 2024 18:12:52 -0300 Subject: [PATCH 2/2] (role/auxtel-ccs.yaml) add atsccsdb database --- hieradata/cluster/auxtel-ccs.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hieradata/cluster/auxtel-ccs.yaml b/hieradata/cluster/auxtel-ccs.yaml index d4501a9a1d..3540858198 100644 --- a/hieradata/cluster/auxtel-ccs.yaml +++ b/hieradata/cluster/auxtel-ccs.yaml @@ -33,6 +33,8 @@ clustershell::groupmembers: hcu: {group: "hcu", member: "auxtel-hcu01"} all: {group: "all", member: "@misc,@hcu"} +ccs_database::database: "atsccsdb" + ccs_monit::alert: - "auxtel-ccs-alerts-aaaaoikgy7stloxmg54kii7uwi@rubin-obs.slack.com"