From: Michael Friedrich Date: Sun, 13 Oct 2013 18:33:36 +0000 (+0200) Subject: Vagrant: Provision icinga2-ido-mysql database. X-Git-Tag: v0.0.3~148 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e747daceccd53d2588de58892c104299a88a2d46;p=icinga2 Vagrant: Provision icinga2-ido-mysql database. --- diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp index 16ecb16af..1c3c1f18f 100644 --- a/.vagrant-puppet/manifests/default.pp +++ b/.vagrant-puppet/manifests/default.pp @@ -130,14 +130,27 @@ service { 'icinga2': exec { 'Enable Icinga 2 features': command => 'i2enfeature statusdat; \ - i2enfeature compat-log; - i2enfeature command;', - require => Package['icinga2'], + i2enfeature compat-log; \ + i2enfeature command; \ + i2enfeature ido-mysql;', + require => [ Package['icinga2'], Exec['populate-icinga2-ido-mysql-db'] ] } file { "/etc/icinga2/features-enabled/*": notify => Service['icinga2'] } - + +# provision icinga2-ido-mysql db +exec { 'populate-icinga2-ido-mysql-db': + unless => 'mysql -uicinga -picinga icinga -e "SELECT * FROM icinga_dbversion;" &> /dev/null', + command => 'mysql -uicinga -picinga icinga < /usr/share/doc/icinga2-ido-mysql-$(rpm -q icinga2-ido-mysql | cut -d\'-\' -f4)/schema/mysql.sql', + require => [ Package['icinga2-ido-mysql'], Exec['create-mysql-icinga2-ido-db'] ] +} + +#exec { 'populate-icinga2-ido-pgsql-db': +# unless => 'psql -U icinga -d icinga -c "SELECT * FROM icinga_dbversion;" &> /dev/null', +# command => 'sudo -u postgres psql -U icinga -d icinga < /usr/share/doc/icinga2-ido-pgsql-$(rpm -q icinga2-ido-mysql | cut -d\'-\' -f4)/schema/pgsql.sql', +# require => [ Package['icinga2-ido-pgsql'], Exec['create-pgsql-icinga2-ido-db'] ] +#} diff --git a/Vagrantfile b/Vagrantfile index 396832bdd..6a5b66918 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -90,6 +90,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| puppet.module_path = ".vagrant-puppet/modules" puppet.manifests_path = ".vagrant-puppet/manifests" # puppet.options = "-v -d" + puppet.options = "--verbose --debug" end config.vm.provision :shell, :path => ".vagrant-puppet/manifests/finalize.sh"