Andrew Bogott has submitted this change and it was merged.
Change subject: contint: set Zuul URL based on server fqdn
......................................................................
contint: set Zuul URL based on server fqdn
The zuul_url parameter is set by zuul-merger to indicate to the Jenkins
jobs from where patches can be fetched from.
Since we have the Zuul scheduler and merger cohosted on the same machine
gallium.wikimedia.org, I used the service DNS entry 'zuul.eqiad.wmnet'.
We are going to add a zuul-merger on scandium.eqiad.wmnet (T95046), so
the zuul_url parameters needs to vary based on the host.
Previously we had:
ZUUL_URL=git://zuul.eqiad.wmnet
That will now becomes:
ZUUL_URL=git://gallium.wikimedia.org
For scandium, it will be:
ZUUL_URL=git://scandium.eqiad.wmnet
Bug: T95046
Change-Id: I07323dfb5373be12d22cee4a1d4c36bf6e3ab3d6
---
M manifests/role/zuul.pp
M modules/zuul/manifests/merger.pp
2 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/zuul.pp b/manifests/role/zuul.pp
index 9400be6..18d41d6 100644
--- a/manifests/role/zuul.pp
+++ b/manifests/role/zuul.pp
@@ -29,8 +29,7 @@
'git_dir' => '/srv/ssd/zuul/git',
'git_email' => "zuul-merger@${::hostname}",
'git_name' => 'Wikimedia Zuul Merger',
- # FIXME should be $::fqdn
- 'zuul_url' => 'git://zuul.eqiad.wmnet',
+ 'zuul_url' => "git://${::fqdn}",
},
'labs' => {
# FIXME migrate under /data/project whenever T66868 is solved
diff --git a/modules/zuul/manifests/merger.pp b/modules/zuul/manifests/merger.pp
index 367d357..ff25391 100644
--- a/modules/zuul/manifests/merger.pp
+++ b/modules/zuul/manifests/merger.pp
@@ -25,7 +25,7 @@
$git_email = "zuul-merger@${::hostname}",
$git_name = 'Wikimedia Zuul Merger',
$status_url = "https://${::fqdn}/zuul/status";,
- $zuul_url = 'git://zuul.eqiad.wmnet',
+ $zuul_url = $::fqdn,
) {
require ::zuul
--
To view, visit https://gerrit.wikimedia.org/r/249389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I07323dfb5373be12d22cee4a1d4c36bf6e3ab3d6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
