[MediaWiki-commits] [Gerrit] Fix some variable scoping issues in osm - change (operations/puppet)

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review.

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

Change subject: Fix some variable scoping issues in osm
......................................................................

Fix some variable scoping issues in osm

node level is not top-level and class includes should come after
variable definition in node stanzas

Change-Id: I6edc1292851ea019eef3a5321c317187bca170af
---
M manifests/role/osm.pp
M manifests/site.pp
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/116275/1

diff --git a/manifests/role/osm.pp b/manifests/role/osm.pp
index bb82d14..d979051 100644
--- a/manifests/role/osm.pp
+++ b/manifests/role/osm.pp
@@ -9,7 +9,7 @@
     include postgresql::postgis
     include passwords::osm
 
-    if $::osm_slave_v4 {
+    if $osm_slave_v4 {
         postgresql::user { "replication@${::osm_slave}-v4":
             ensure   => 'present',
             user     => 'replication',
@@ -22,7 +22,7 @@
             require  => Class['postgresql::master'],
         }
     }
-    if $::osm_slave_v6 {
+    if $osm_slave_v6 {
         postgresql::user { "replication@${::osm_slave}-v6":
             ensure   => 'present',
             user     => 'replication',
@@ -43,7 +43,7 @@
     include passwords::osm
 
     class {'postgresql::slave':
-        master_server    => $::osm_master,
+        master_server    => $osm_master,
         replication_pass => $passwords::osm::replication_pass,
     }
 }
diff --git a/manifests/site.pp b/manifests/site.pp
index e894fc1..67b5b66 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1387,16 +1387,16 @@
 }
 
 node 'labsdb1004.eqiad.wmnet' {
-    include role::osm::master
-
     $osm_slave = 'labsdb1005.eqiad.wmnet'
     $osm_slave_v4 = '10.64.37.9'
+
+    include role::osm::master
 }
 
 node 'labsdb1005.eqiad.wmnet' {
-    include role::osm::slave
+    $osm_master = 'labsdb1004.eqiad.wmnet'
 
-    $master_server = 'labsdb1004.eqiad.wmnet'
+    include role::osm::slave
 }
 
 node /labstore[12]\.pmtpa\.wmnet/ {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6edc1292851ea019eef3a5321c317187bca170af
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