tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Vagrant: Fix Icinga 2 MySQL creation 

refs #6741
This commit is contained in:
Michael Friedrich 2014-07-29 13:04:20 +02:00
parent 64954e9924
commit 0b1aee8a35
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.vagrant-puppet/manifests/default.pp
View File

@ -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',