Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266216
Change subject: role::deployment::salt_masters: correct a hiera lookup
......................................................................
role::deployment::salt_masters: correct a hiera lookup
Change-Id: I03ac55c0ad598d1f24cf467c39c239d6f3c7659b
---
M modules/role/manifests/deployment/salt_masters.pp
1 file changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/16/266216/1
diff --git a/modules/role/manifests/deployment/salt_masters.pp
b/modules/role/manifests/deployment/salt_masters.pp
index dcebd63..4b22c0f 100644
--- a/modules/role/manifests/deployment/salt_masters.pp
+++ b/modules/role/manifests/deployment/salt_masters.pp
@@ -1,17 +1,21 @@
# === Class role::deployment::salt_masters
# Installs deployment-related data to the salt master
class role::deployment::salt_masters(
- $deployment_server = hiera('deployment_server', 'tin.eqiad.wmnet'),
-) {
+ $deployment_server = undef
+ ) {
+ $deployment_host = $deployment_server ? {
+ undef => hiera('deployment_server', 'tin.eqiad.wmnet'),
+ default => $deployment_server
+ }
$deployment_config = {
'parent_dir' => '/srv/deployment',
'servers' => {
- 'eqiad' => $deployment_server,
- 'codfw' => $deployment_server,
+ 'eqiad' => $deployment_host,
+ 'codfw' => $deployment_host,
},
'redis' => {
- 'host' => $deployment_server,
+ 'host' => $deployment_host,
'port' => '6379',
'db' => '0',
'socket_connect_timeout' => '5',
--
To view, visit https://gerrit.wikimedia.org/r/266216
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03ac55c0ad598d1f24cf467c39c239d6f3c7659b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
