Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/264944
Change subject: role::deployment: make it possible to switch between different
servers
......................................................................
role::deployment: make it possible to switch between different servers
Bug: T124024
Change-Id: I33311b76728a6aa9df7d87500b6b3fc90a11a033
---
M modules/role/manifests/deployment/salt_masters.pp
M modules/role/manifests/deployment/server.pp
M modules/scap/manifests/master.pp
M modules/trebuchet/manifests/init.pp
4 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/264944/1
diff --git a/modules/role/manifests/deployment/salt_masters.pp
b/modules/role/manifests/deployment/salt_masters.pp
index e1c3134..dcebd63 100644
--- a/modules/role/manifests/deployment/salt_masters.pp
+++ b/modules/role/manifests/deployment/salt_masters.pp
@@ -1,7 +1,7 @@
# === Class role::deployment::salt_masters
# Installs deployment-related data to the salt master
class role::deployment::salt_masters(
- $deployment_server = 'tin.eqiad.wmnet',
+ $deployment_server = hiera('deployment_server', 'tin.eqiad.wmnet'),
) {
$deployment_config = {
diff --git a/modules/role/manifests/deployment/server.pp
b/modules/role/manifests/deployment/server.pp
index 4a3c889..8a0670e 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -1,9 +1,11 @@
class role::deployment::server(
$apache_fqdn = $::fqdn,
$deployment_group = 'wikidev',
-) {
+ ) {
include standard
+
+
# Can't include this while scap is present on the deployment server:
# include misc::deployment::scripts
include role::deployment::mediawiki
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index 78b278a..185ecd1 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -1,10 +1,10 @@
# = class: scap::master
#
-# Sets up a scap master (currently tin)
+# Sets up a scap master (currently tin and mira)
class scap::master(
$common_path = '/srv/mediawiki',
$common_source_path = '/srv/mediawiki-staging',
- $rsync_host = 'tin.eqiad.wmnet',
+ $rsync_host = "deployment.${::site}.wmnet",
$statsd_host = 'statsd.eqiad.wmnet',
$statsd_port = 8125,
$deployment_group = 'wikidev',
diff --git a/modules/trebuchet/manifests/init.pp
b/modules/trebuchet/manifests/init.pp
index d35428d..9a0d9bc 100644
--- a/modules/trebuchet/manifests/init.pp
+++ b/modules/trebuchet/manifests/init.pp
@@ -9,7 +9,7 @@
) {
$trebuchet_master = $::realm ? {
labs => pick($deployment_server,
"${::labsproject}-deploy.eqiad.wmflabs"),
- default => 'tin.eqiad.wmnet',
+ default => hiera('deployment_server','tin.eqiad.wmnet'),
}
include ::trebuchet::packages
--
To view, visit https://gerrit.wikimedia.org/r/264944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33311b76728a6aa9df7d87500b6b3fc90a11a033
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
