From 0b1aee8a35a1b8fd0f88843bf2d12f997db7a951 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 29 Jul 2014 13:04:20 +0200
Subject: [PATCH] Vagrant: Fix Icinga 2 MySQL creation
refs #6741
---
.vagrant-puppet/manifests/default.pp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp
index 68affd347..c05743719 100644
--- a/.vagrant-puppet/manifests/default.pp
+++ b/.vagrant-puppet/manifests/default.pp
@@ -5,8 +5,8 @@ include openldap
Exec { path => '/bin:/usr/bin:/sbin' }
-$icingaVersion = '1.11.2'
-$icinga2Version = '2.0.0'
+$icingaVersion = '1.11.5'
+$icinga2Version = '2.0.1'
exec { 'create-mysql-icinga-db':
unless => 'mysql -uicinga -picinga icinga',
@@ -421,11 +421,10 @@ package { 'icinga2-ido-mysql':
exec { 'populate-icinga2-mysql-db':
unless => 'mysql -uicinga2 -picinga2 icinga2 -e "SELECT * FROM icinga_dbversion;" &> /dev/null',
- command => "mysql -uroot icinga2 < /usr/share/doc/icinga2-ido-mysql-$icinga2Version/schema/mysql.sql",
+ command => 'mysql -uroot icinga2 < /usr/share/doc/icinga2-ido-mysql-$(rpm -q icinga2-ido-mysql | cut -d\'-\' -f4)/schema/mysql.sql',
require => [ Exec['create-mysql-icinga2-db'], Package['icinga2-ido-mysql'] ]
}
-
file { '/etc/icinga2/features-available/ido-mysql.conf':
source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/features-available/ido-mysql.conf',
owner => 'icinga',