(role/ccs-mcm) merge role/atsccs into role/ccs-mcm

lsst-it · Nov 26, 2024 · 15d7892 · 15d7892
1 parent 4119db2
commit 15d7892
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 55 deletions.
diff --git a/hieradata/role/atsccs.yaml b/hieradata/role/atsccs.yaml
diff --git a/hieradata/role/ccs-mcm.yaml b/hieradata/role/ccs-mcm.yaml
@@ -35,6 +35,6 @@ profile::core::systemd::tmpfile:
 
 ccs_software::services:
   prod:
-    - "mmm"
     - "cluster-monitor"
     - "lockmanager"
+    - "mmm"
diff --git a/spec/hosts/nodes/auxtel-mcm.cp.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-mcm.cp.lsst.org_spec.rb
@@ -17,7 +17,7 @@
       end
       let(:node_params) do
         {
-          role: 'atsccs',
+          role: 'ccs-mcm',
           site: 'cp',
           cluster: 'auxtel-ccs',
         }
@@ -26,8 +26,14 @@
       it { is_expected.to compile.with_all_deps }
 
       include_examples 'baremetal'
-      it { is_expected.to contain_class('nfs').with_server_enabled(false) }
-      it { is_expected.to contain_class('nfs').with_client_enabled(false) }
+
+      it { is_expected.to contain_class('Ccs_software::Service') }
+      it { is_expected.to contain_service('cluster-monitor') }
+      it { is_expected.to contain_service('kafka-broker-service') }
+      it { is_expected.to contain_service('localdb') }
+      it { is_expected.to contain_service('lockmanager') }
+      it { is_expected.to contain_service('mmm') }
+      it { is_expected.to contain_service('rest-server') }
     end # on os
   end # on_supported_os
 end # role
diff --git a/spec/hosts/nodes/auxtel-mcm.ls.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-mcm.ls.lsst.org_spec.rb
@@ -19,7 +19,7 @@
       end
       let(:node_params) do
         {
-          role: 'atsccs',
+          role: 'ccs-mcm',
           site: 'ls',
           cluster: 'auxtel-ccs',
           variant: '1114s',
@@ -87,9 +87,10 @@
       it { is_expected.to contain_file('/etc/ccs/setup-sal5').with_content(%r{^export LSST_DDS_PARTITION_PREFIX=base}) }
 
       it { is_expected.to contain_class('Ccs_software::Service') }
-      it { is_expected.to contain_service('mmm') }
       it { is_expected.to contain_service('cluster-monitor') }
       it { is_expected.to contain_service('localdb') }
+      it { is_expected.to contain_service('lockmanager') }
+      it { is_expected.to contain_service('mmm') }
       it { is_expected.to contain_service('rest-server') }
 
       it do

diff --git a/spec/hosts/nodes/auxtel-mcm.tu.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-mcm.tu.lsst.org_spec.rb
@@ -19,7 +19,7 @@
       end
       let(:node_params) do
         {
-          role: 'atsccs',
+          role: 'ccs-mcm',
           site: 'tu',
           cluster: 'auxtel-ccs',
         }
@@ -57,6 +57,11 @@
         it { expect(nm_keyfile['ipv4']['route1']).to eq('140.252.147.48/28,140.252.147.17') }
         it { expect(nm_keyfile['ipv4']['route2']).to eq('140.252.147.128/27,140.252.147.17') }
       end
+
+      it { is_expected.to contain_class('Ccs_software::Service') }
+      it { is_expected.to contain_service('cluster-monitor') }
+      it { is_expected.to contain_service('lockmanager') }
+      it { is_expected.to contain_service('mmm') }
     end # on os
   end # on_supported_os
 end
diff --git a/spec/hosts/roles/atsccs_spec.rb b/spec/hosts/roles/atsccs_spec.rb
diff --git a/spec/hosts/roles/ccs_mcm_spec.rb b/spec/hosts/roles/ccs_mcm_spec.rb
@@ -10,6 +10,7 @@
       %w[
         comcam-ccs
         auxtel-ccs
+        lsstcam-ccs
       ].each do |cluster|
         context "#{cluster} cluster" do
           lsst_sites.each do |site|
@@ -29,6 +30,8 @@
               include_examples('ccs common', os_facts:)
               include_examples('x2go packages', os_facts:)
               include_examples('debugutils')
+
+              it { is_expected.to contain_class('ccs_sal') }
             end # host
           end # lsst_sites
         end # cluster