From d681031b7b81b0733ab948feb963b1d3e9821781 Mon Sep 17 00:00:00 2001 From: Marius Hein Date: Fri, 9 May 2014 18:40:46 +0200 Subject: [PATCH] Vagrant/Icinga2: Add dependencies for test config refs #6127 --- .vagrant-puppet/manifests/default.pp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp index 4d30e58c4..0119837f4 100644 --- a/.vagrant-puppet/manifests/default.pp +++ b/.vagrant-puppet/manifests/default.pp @@ -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', owner => 'icinga', group => 'icinga', - require => Exec['install icinga2'] + require => [ Exec['install icinga2'], Exec['create_monitoring_test_config'] ] } file { '/etc/icinga2/conf.d/commands.conf': @@ -421,7 +421,6 @@ service { 'icinga2': ] } - 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",