Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/210838
Change subject: WIP: deployment: make rsync_host configurable
......................................................................
WIP: deployment: make rsync_host configurable
Looks like rsync_host must be configurable in the deployment server role,
because it includes scap::master and that has:
$rsync_host = 'tin.eqiad.wmnet', as a default value
In order to add a second deployment host, mira, in codfw that would have to
be changed.
Bug:T95436
Change-Id: Iaa90d73582ad46dd87ea3e0beef8ca212a2d1d3e
---
M manifests/role/deployment.pp
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/38/210838/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index f59a56a..e1a7f76 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -129,6 +129,7 @@
$key_source = 'puppet:///private/ssh/tin/mwdeploy_rsa',
$apache_fqdn = $::fqdn,
$deployment_group = 'wikidev',
+ $rsync_host = 'tin.eqiad.wmnet',
) {
# Can't include this while scap is present on tin:
# include misc::deployment::scripts
@@ -157,6 +158,10 @@
include mediawiki
include scap::master
+ class { 'scap::master':
+ rsync_host => $rsync_host,
+ }
+
if $::realm != 'labs' {
include wikitech::wiki::passwords
}
--
To view, visit https://gerrit.wikimedia.org/r/210838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa90d73582ad46dd87ea3e0beef8ca212a2d1d3e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
