From 2bdc21190da1e9528654cf05a0d94b9cb35c47c0 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Wed, 4 Jun 2014 15:55:16 +0200
Subject: [PATCH] Vagrant: Install debuginfo and latest packages by default.

Fixes #6407
---
 .../modules/icinga-web/manifests/init.pp      |  4 ++--
 .../icinga2-classicui/manifests/init.pp       |  4 ++--
 .../modules/icinga2/manifests/init.pp         | 21 +++++++++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.vagrant-puppet/modules/icinga-web/manifests/init.pp b/.vagrant-puppet/modules/icinga-web/manifests/init.pp
index fa687f4aa..adc911bff 100644
--- a/.vagrant-puppet/modules/icinga-web/manifests/init.pp
+++ b/.vagrant-puppet/modules/icinga-web/manifests/init.pp
@@ -13,13 +13,13 @@ class icinga-web {
   }
 
   package { 'icinga-web':
-    ensure => installed,
+    ensure => latest,
     require => Class['icinga-rpm-snapshot'],
     notify => Service['apache']
   }
 
   package { 'icinga-web-mysql':
-    ensure => installed,
+    ensure => latest,
     require => Class['icinga-rpm-snapshot'],
     notify => Service['apache']
   }
diff --git a/.vagrant-puppet/modules/icinga2-classicui/manifests/init.pp b/.vagrant-puppet/modules/icinga2-classicui/manifests/init.pp
index d5904ac89..7925ce4d9 100644
--- a/.vagrant-puppet/modules/icinga2-classicui/manifests/init.pp
+++ b/.vagrant-puppet/modules/icinga2-classicui/manifests/init.pp
@@ -5,14 +5,14 @@ class icinga2-classicui {
   # workaround for package conflicts
   # icinga-gui pulls icinga-gui-config automatically
   package { 'icinga2-classicui-config':
-    ensure => installed,
+    ensure => latest,
     before => Package["icinga-gui"],
     require => Class['icinga-rpm-snapshot'],
     notify => Service['apache']
   }
 
   package { 'icinga-gui':
-    ensure => installed,
+    ensure => latest,
     alias => 'icinga-gui'
   }
 
diff --git a/.vagrant-puppet/modules/icinga2/manifests/init.pp b/.vagrant-puppet/modules/icinga2/manifests/init.pp
index 7a2576fd1..b1c1cb3d6 100644
--- a/.vagrant-puppet/modules/icinga2/manifests/init.pp
+++ b/.vagrant-puppet/modules/icinga2/manifests/init.pp
@@ -7,14 +7,28 @@ class icinga2 {
     alias => 'icinga2'
   }
 
+  package { 'icinga2-bin':
+    ensure => latest,
+    require => Class['icinga-rpm-snapshot'],
+    alias => 'icinga2-bin'
+  }
+
+  package { 'icinga2-common':
+    ensure => latest,
+    require => Class['icinga-rpm-snapshot'],
+    alias => 'icinga2-common'
+  }
+
   package { 'icinga2-doc':
     ensure => latest,
     require => Class['icinga-rpm-snapshot'],
     alias => 'icinga2-doc'
   }
 
-  package { 'mailx':
-    ensure => installed,
+  package { 'icinga2-debuginfo':
+    ensure => latest,
+    require => Class['icinga-rpm-snapshot'],
+    alias => 'icinga2-debuginfo'
   }
 
   service { 'icinga2':
@@ -29,8 +43,7 @@ class icinga2 {
     notify => Service['icinga2']
   }
 
-  icinga2::feature { 'livestatus':
-  }
+  icinga2::feature { 'livestatus': }
 }
 
 class icinga2-ido-mysql {
-- 
2.40.0