Alexandros Kosiaris has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/311972

Change subject: postgres::user: Move dependency to pass_set exec
......................................................................

postgres::user: Move dependency to pass_set exec

Since there are cases where pass_set will not be in the catalog anymore,
move the dependency to it. Make the notify a subscribe for that to work

Change-Id: Ic1f55a8dadb4954fc036daf3ce5f3fe6dc2caf2d
---
M modules/postgresql/manifests/user.pp
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/311972/1

diff --git a/modules/postgresql/manifests/user.pp 
b/modules/postgresql/manifests/user.pp
index b72948f..061432d 100644
--- a/modules/postgresql/manifests/user.pp
+++ b/modules/postgresql/manifests/user.pp
@@ -57,7 +57,6 @@
             command => "/usr/bin/createuser --no-superuser --no-createdb 
--no-createrole ${user}",
             user    => 'postgres',
             unless  => $userexists,
-            notify  => Exec["pass_set-${name}"],
         }
         # This will set the password and attributes on every puppet run. We 
explicitly dont
         # depend on anything to ensure consistency with configuration and that
@@ -68,9 +67,10 @@
         # This will not be run on a slave as it is read-only
         if $master {
             exec { "pass_set-${name}":
-                command => $pass_set,
-                user    => 'postgres',
-                onlyif  => $userexists,
+                command    => $pass_set,
+                user       => 'postgres',
+                onlyif     => $userexists,
+                subscribe  => Exec["create_user-${name}"],
             }
         }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/311972
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1f55a8dadb4954fc036daf3ce5f3fe6dc2caf2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to