Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327181 )

Change subject: if guard the slave in role::postgres::master
......................................................................

if guard the slave in role::postgres::master

Change-Id: I6ae64953e757f0a137791f89b0c7ec498f729b91
---
M modules/role/manifests/postgres/master.pp
1 file changed, 13 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/81/327181/1

diff --git a/modules/role/manifests/postgres/master.pp 
b/modules/role/manifests/postgres/master.pp
index 144c1cc..0105419 100644
--- a/modules/role/manifests/postgres/master.pp
+++ b/modules/role/manifests/postgres/master.pp
@@ -20,17 +20,19 @@
     }
 
     $postgres_slave = hiera('role::postgres::master::slave', undef)
-    $postgres_slave_v4 = ipresolve($postgres_slave, 4)
-    if $postgres_slave_v4 {
-        postgresql::user { "replication@${::postgres_slave}-v4":
-            ensure   => 'present',
-            user     => 'replication',
-            password => $passwords::postgres::replication_pass,
-            cidr     => "${::postgres_slave_v4}/32",
-            type     => 'host',
-            method   => 'md5',
-            attrs    => 'REPLICATION',
-            database => 'all',
+    if $postgres_slave {
+        $postgres_slave_v4 = ipresolve($postgres_slave, 4)
+        if $postgres_slave_v4 {
+            postgresql::user { "replication@${::postgres_slave}-v4":
+                ensure   => 'present',
+                user     => 'replication',
+                password => $passwords::postgres::replication_pass,
+                cidr     => "${::postgres_slave_v4}/32",
+                type     => 'host',
+                method   => 'md5',
+                attrs    => 'REPLICATION',
+                database => 'all',
+            }
         }
     }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ae64953e757f0a137791f89b0c7ec498f729b91
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to