Merge pull request #1561 from lsst-it/IT-5838_cleanup_mariadb_profile

(role/auxtelmcm) add ccs_database
lsst-it · Dec 17, 2024 · 75249cb · 75249cb
2 parents 6a3c82e + 6023a88
commit 75249cb
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 46 deletions.
diff --git 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:
   - "[email protected]"
 

diff --git 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
diff --git a/spec/classes/core/auxtelmcm_spec.rb b/spec/classes/core/auxtelmcm_spec.rb
diff --git 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