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

Vagrant/Icinga2: Add dependencies for test config 

refs #6127
This commit is contained in:
Marius Hein 2014-05-09 18:40:46 +02:00
parent 8d42914a84
commit d681031b7b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,7 +401,7 @@ file { '/etc/icinga2/conf.d/test-config.conf':
source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/conf.d/test-config.conf', source => 'puppet:////vagrant/.vagrant-puppet/files/etc/icinga2/conf.d/test-config.conf',
owner => 'icinga', owner => 'icinga',
group => 'icinga', group => 'icinga',
require => Exec['install icinga2'] require => [ Exec['install icinga2'], Exec['create_monitoring_test_config'] ]
} }
file { '/etc/icinga2/conf.d/commands.conf': file { '/etc/icinga2/conf.d/commands.conf':
@ -421,7 +421,6 @@ service { 'icinga2':
] ]
} }
exec { 'populate-icinga2-mysql-db': exec { 'populate-icinga2-mysql-db':
unless => 'mysql -uicinga2 -picinga2 icinga2 -e "SELECT * FROM icinga_dbversion;" &> /dev/null', 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-$icinga2Version/schema/mysql.sql",