From 561ea1c6dace320455990b880d8a7da421fcb8bc Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 6 Nov 2012 10:36:18 +0100
Subject: sleep some more after couchdb restart, adopt new hiera creditials

---
 puppet/modules/site_couchdb/manifests/configure.pp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/puppet/modules/site_couchdb/manifests/configure.pp b/puppet/modules/site_couchdb/manifests/configure.pp
index 4343cc2b..25ea7a0b 100644
--- a/puppet/modules/site_couchdb/manifests/configure.pp
+++ b/puppet/modules/site_couchdb/manifests/configure.pp
@@ -12,10 +12,9 @@ class site_couchdb::configure {
     group  => 'root',
   }
 
-  $adminpw = $site_couchdb::adminpw
   file { '/etc/couchdb/local.d/admin.ini':
     content => "[admins]
-admin = $adminpw
+admin = $site_couchdb::couchdb_admin_pw
 ",
     mode    => '0600',
     owner   => 'couchdb',
@@ -24,7 +23,7 @@ admin = $adminpw
   }
 
 
-  exec { '/etc/init.d/couchdb restart; sleep 3':
+  exec { '/etc/init.d/couchdb restart; sleep 6':
     path        => ['/bin', '/usr/bin',],
     subscribe   => File['/etc/couchdb/local.d/admin.ini',
       '/etc/couchdb/local.ini'],
-- 
cgit v1.2.3