(choria-io#207) ensure mcollective is installed via choria module

Signed-off-by: R.I.Pienaar <rip@devco.net>
ripienaar · Jan 15, 2021 · bf8eff2 · bf8eff2
1 parent 5f5ce51
commit bf8eff2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -102,6 +102,8 @@
     contain choria::service_disable
   }
 
+  contain mcollective
+
   contain choria::install
   contain choria::scout_checks
   contain choria::scout_metrics

diff --git a/metadata.json b/metadata.json
@@ -8,6 +8,7 @@
   "project_page": "https://github.com/choria-io/puppet-choria",
   "issues_url": "https://github.com/choria-io/puppet-choria/issues",
   "dependencies": [
+    { "name": "puppetlabs/scheduled_task", "version_requirement": ">= 2.3.0 < 3.0.0" },
     { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.24.0 < 7.0.0" },
     { "name": "puppetlabs/apt", "version_requirement": ">= 4.5.1 < 8.0.0" },
     { "name": "choria/mcollective_choria", "version_requirement": ">= 0.20.0 < 2.0.0" },

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -13,6 +13,7 @@
       end
       context 'with all defaults' do
         it { is_expected.to compile.with_all_deps }
+        it { is_expected.to contain_class("mcollective") }
         it { is_expected.to contain_class("choria") }
         it { is_expected.to contain_class("choria::config") }
         it { is_expected.to contain_class("choria::install") }