Filippo Giunchedi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/347898 )
Change subject: Scap: set deployment_server correctly ...................................................................... Scap: set deployment_server correctly The only place that the deployment_server should be set is in the global config. This change corrects the global scap config. When we need to change the deployment_server to mira, we should be able to update the scap::deployment_server value here to ensure that the value is updated for all repositories that are deployed via Scap3. Bug: T162814 Change-Id: I27ed2e8989db8b45e7b3397d37b961065f606bee --- M hieradata/common/scap.yaml M modules/scap/templates/scap.cfg.erb 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/hieradata/common/scap.yaml b/hieradata/common/scap.yaml index edff342..115c26a 100644 --- a/hieradata/common/scap.yaml +++ b/hieradata/common/scap.yaml @@ -1,2 +1,2 @@ # scap3 (git-based) deployment server -scap::deployment_server: "deployment.eqiad.wmnet" +scap::deployment_server: "tin.eqiad.wmnet" diff --git a/modules/scap/templates/scap.cfg.erb b/modules/scap/templates/scap.cfg.erb index ac4a753..16e0947 100644 --- a/modules/scap/templates/scap.cfg.erb +++ b/modules/scap/templates/scap.cfg.erb @@ -68,7 +68,7 @@ [wmnet] # Wikimedia Foundation production cluster configuration -master_rsync: deployment.eqiad.wmnet +master_rsync: <%= @deployment_server %> statsd_host: statsd.eqiad.wmnet tcpircbot_host: icinga.wikimedia.org udp2log_host: mwlog1001.eqiad.wmnet @@ -83,7 +83,7 @@ [wikimedia.org] # Wikimedia Foundation production cluster configuration for "public" hosts # This should match the [wmnet] configuration -master_rsync: deployment.eqiad.wmnet +master_rsync: <%= @deployment_server %> statsd_host: statsd.eqiad.wmnet tcpircbot_host: icinga.wikimedia.org udp2log_host: mwlog1001.eqiad.wmnet @@ -91,6 +91,7 @@ [wmflabs] # Wikimedia Foundation beta cluster configuration +git_server: <%= @wmflabs_master %> master_rsync: <%= @wmflabs_master %> statsd_host: labmon1001.eqiad.wmnet udp2log_host: deployment-fluorine02.deployment-prep.eqiad.wmflabs -- To view, visit https://gerrit.wikimedia.org/r/347898 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I27ed2e8989db8b45e7b3397d37b961065f606bee Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Thcipriani <[email protected]> Gerrit-Reviewer: Chad <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
