Merge pull request #180 from Icinga/feature/businessprocess-2-2-0-ipl

Business Process: Update to 2.2.0 and setup IPL as dependency
Icinga · Mar 13, 2019 · 8617d25 · 8617d25
2 parents c3c8813 + f68f3f4
commit 8617d25
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/.puppet/hieradata/common.yaml b/.puppet/hieradata/common.yaml
@@ -35,6 +35,7 @@ icinga::repo::type:                     "snapshot" # you can use 'release' too
 # Versions
 grafana::version:                       "6.0.1"
 graphite::version:                      "1.1.5"
+icinga::ipl::version:                   "v0.1.1"
 icinga::director::version:              "v1.6.2"
 
 elastic::repo::version:                 6

diff --git a/.puppet/modules/profiles/manifests/icinga/icingaweb2.pp b/.puppet/modules/profiles/manifests/icinga/icingaweb2.pp
@@ -2,6 +2,7 @@
   $node_name = 'icinga2',
   $api_username = 'root',
   $api_password = 'icinga',
+  $ipl_version = lookup('icinga::ipl::version'),
   $modules = {},
   $themes = {}
 ) {
@@ -176,6 +177,12 @@
   }
 
   # Modules
+  # Enforce 'ipl' as a base dependency module
+  icingaweb2::module { 'ipl':
+    install_method => 'git',
+    git_repository => 'https://github.com/Icinga/icingaweb2-module-ipl.git',
+    git_revision   => $ipl_version
+  }
 
   # Director
   if ('director' in $modules) {