From 9a50cb8fa3d347abff21726088b6dcdaf9963430 Mon Sep 17 00:00:00 2001 From: Alexander Klimov Date: Tue, 5 Aug 2014 15:15:46 +0200 Subject: [PATCH] Outsource 'icinga_unittest' database creation into pgsql::database::create refs #6842 --- .vagrant-puppet/manifests/default.pp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.vagrant-puppet/manifests/default.pp b/.vagrant-puppet/manifests/default.pp index cc50a9355..8e719bd78 100644 --- a/.vagrant-puppet/manifests/default.pp +++ b/.vagrant-puppet/manifests/default.pp @@ -489,12 +489,9 @@ exec { 'create-mysql-icinga_unittest-db': require => Service['mysqld'] } -exec{ 'create-pgsql-icinga_unittest-db': - unless => 'sudo -u postgres psql -tAc "SELECT 1 FROM pg_roles WHERE rolname=\'icinga_unittest\'" | grep -q 1', - command => 'sudo -u postgres psql -c "CREATE ROLE icinga_unittest WITH LOGIN PASSWORD \'icinga_unittest\';" && \ - sudo -u postgres createdb -O icinga_unittest -E UTF8 -T template0 icinga_unittest && \ - sudo -u postgres createlang plpgsql icinga_unittest', - require => Service['postgresql'] +pgsql::database::create { 'icinga_unittest': + username => 'icinga_unittest', + password => 'icinga_unittest', } exec { 'install php-ZendFramework-Db-Adapter-Pdo-Pgsql':