[icinga-checkins] icinga.org: icingaweb2/master: Update puppet vagrant provision to use new database schemas

git at icinga.org git at icinga.org
Tue Nov 18 13:05:17 CET 2014


Module: icingaweb2
Branch: master
Commit: 985df1124b2dd1f71257bca7668e427b3c3ec598
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=985df1124b2dd1f71257bca7668e427b3c3ec598

Author: Alexander Fuhr <alexander.fuhr at netways.de>
Date:   Tue Nov 18 13:02:49 2014 +0100

Update puppet vagrant provision to use new database schemas

fixes #7698

---

 .vagrant-puppet/manifests/default.pp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp
index 117ad08..c728d80 100644
--- a/.vagrant-puppet/manifests/default.pp
+++ b/.vagrant-puppet/manifests/default.pp
@@ -602,14 +602,14 @@ exec { 'create-pgsql-icingaweb-db':
 }
 
 exec { 'populate-icingaweb-mysql-db-tables':
-  unless  => 'mysql -uicingaweb -picingaweb icingaweb -e "SELECT * FROM account;" &> /dev/null',
-  command => 'mysql -uicingaweb -picingaweb icingaweb < /vagrant/etc/schema/mysql.sql',
+  unless  => 'mysql -uicingaweb -picingaweb icingaweb -e "SELECT * FROM icingaweb_group;" &> /dev/null',
+  command => 'mysql -uicingaweb -picingaweb icingaweb < /vagrant/etc/schema/mysql.schema.sql',
   require => [ Exec['create-mysql-icingaweb-db'] ]
 }
 
 exec { 'populate-icingweba-pgsql-db-tables':
-  unless  => 'psql -U icingaweb -d icingaweb -c "SELECT * FROM account;" &> /dev/null',
-  command => 'sudo -u postgres psql -U icingaweb -d icingaweb -f /vagrant/etc/schema/pgsql.sql',
+  unless  => 'psql -U icingaweb -d icingaweb -c "SELECT * FROM icingaweb_group;" &> /dev/null',
+  command => 'sudo -u postgres psql -U icingaweb -d icingaweb -f /vagrant/etc/schema/pgsql.schema.sql',
   require => [ Exec['create-pgsql-icingaweb-db'] ]
 }
 



More information about the icinga-checkins mailing list