Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327178 )
Change subject: role::postgres::master: Hieraize node scope variable
......................................................................
role::postgres::master: Hieraize node scope variable
Use hiera to actually get the slave instead of the node scope variable
setup that has not been used in quite a while
Change-Id: I95a05ef05ba45bd97063ea99fc0b9acf3fccbe21
---
M manifests/site.pp
M modules/role/manifests/postgres/master.pp
2 files changed, 2 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/327178/1
diff --git a/manifests/site.pp b/manifests/site.pp
index d70b20d..9a8ca23 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1474,10 +1474,6 @@
}
node 'labsdb1004.eqiad.wmnet' {
- # Bug: T101233
- #$postgres_slave = 'labsdb1005.eqiad.wmnet'
- #$postgres_slave_v4 = '10.64.37.9'
-
role(postgres::master, labs::db::slave)
}
diff --git a/modules/role/manifests/postgres/master.pp
b/modules/role/manifests/postgres/master.pp
index c2ca83c..d336c89d6 100644
--- a/modules/role/manifests/postgres/master.pp
+++ b/modules/role/manifests/postgres/master.pp
@@ -19,10 +19,8 @@
description => 'Postgres db master',
}
- # FIXME - top-scope var without namespace, will break in puppet 2.8
- # lint:ignore:variable_scope
+ $postgres_slave_4 = hiera('role::postgres::master::slave_v4', undef)
if $postgres_slave_v4 {
- # lint:endignore
postgresql::user { "replication@${::postgres_slave}-v4":
ensure => 'present',
user => 'replication',
@@ -35,10 +33,8 @@
}
}
- # FIXME - top-scope var without namespace, will break in puppet 2.8
- # lint:ignore:variable_scope
+ $postgres_slave_6 = hiera('role::postgres::master::slave_v6', undef)
if $postgres_slave_v6 {
- # lint:endignore
postgresql::user { "replication@${::postgres_slave}-v6":
ensure => 'present',
user => 'replication',
--
To view, visit https://gerrit.wikimedia.org/r/327178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95a05ef05ba45bd97063ea99fc0b9acf3fccbe21
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
