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

lsst-it · May 24, 2023 · 91abb13 · 91abb13
1 parent 5d44494
commit 91abb13
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 18 deletions.
diff --git a/hieradata/role/atsccs.yaml b/hieradata/role/atsccs.yaml
diff --git a/.../role/atsccs/osfamily/RedHat/major/7.yaml → ...role/ccs-mcm/osfamily/RedHat/major/7.yaml b/.../role/atsccs/osfamily/RedHat/major/7.yaml → ...role/ccs-mcm/osfamily/RedHat/major/7.yaml
diff --git a/spec/hosts/nodes/auxtel-dc01.cp.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-dc01.cp.lsst.org_spec.rb
@@ -13,7 +13,7 @@
 
       let(:node_params) do
         {
-          role: 'atsccs',
+          role: 'ccs-dc',
           site: 'cp',
           cluster: 'auxtel-ccs',
         }

diff --git a/spec/hosts/nodes/auxtel-dc01.ls.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-dc01.ls.lsst.org_spec.rb
@@ -10,7 +10,7 @@
       let(:facts) { facts.merge(fqdn: 'auxtel-dc01.ls.lsst.org') }
       let(:node_params) do
         {
-          role: 'atsccs',
+          role: 'ccs-dc',
           site: 'ls',
           cluster: 'auxtel-ccs',
           variant: '1114s',

diff --git a/spec/hosts/nodes/auxtel-mcm.cp.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-mcm.cp.lsst.org_spec.rb
@@ -13,7 +13,7 @@
 
       let(:node_params) do
         {
-          role: 'atsccs',
+          role: 'ccs-mcm',
           site: 'cp',
           cluster: 'auxtel-ccs',
         }

diff --git a/spec/hosts/nodes/auxtel-mcm.ls.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-mcm.ls.lsst.org_spec.rb
@@ -15,7 +15,7 @@
 
       let(:node_params) do
         {
-          role: 'atsccs',
+          role: 'ccs-mcm',
           site: 'ls',
           cluster: 'auxtel-ccs',
           variant: '1114s',

diff --git a/spec/hosts/nodes/auxtel-mcm.tu.lsst.org_spec.rb b/spec/hosts/nodes/auxtel-mcm.tu.lsst.org_spec.rb
@@ -11,7 +11,7 @@
       let(:facts) { facts.merge(fqdn: 'auxtel-mcm.tu.lsst.org') }
       let(:node_params) do
         {
-          role: 'atsccs',
+          role: 'ccs-mcm',
           site: 'tu',
           cluster: 'auxtel-ccs',
         }

diff --git a/spec/hosts/roles/ccs_mcm_spec.rb b/spec/hosts/roles/ccs_mcm_spec.rb
@@ -16,6 +16,7 @@
       %w[
         comcam-ccs
         auxtel-ccs
+        lsstcam-ccs
       ].each do |cluster|
         context "#{cluster} cluster" do
           let(:node_params) do
@@ -36,6 +37,7 @@
               include_examples 'ccs common', facts: facts
               include_examples 'x2go packages'
               include_examples 'debugutils'
+              it { is_expected.to contain_class('ccs_sal') }
             end # host
           end # lsst_sites
         end # cluster