Alexandros Kosiaris has submitted this change and it was merged.
Change subject: url-downloader: Remove the role from chromium/hydrogen
......................................................................
url-downloader: Remove the role from chromium/hydrogen
Removing the url-downloader role from hydrogen/chromium. Actually
hydrogen was by mistake set as a url-downloader. Also remove the
$url_downloader_ip stuff to allow the IP to be reused in aluminium
Bug: T134496
Change-Id: I3aaeb41391106297c9cecb98e0242206cf02354e
---
D hieradata/hosts/chromium.yaml
M manifests/site.pp
2 files changed, 2 insertions(+), 10 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/hieradata/hosts/chromium.yaml b/hieradata/hosts/chromium.yaml
deleted file mode 100644
index f97625d..0000000
--- a/hieradata/hosts/chromium.yaml
+++ /dev/null
@@ -1 +0,0 @@
-url_downloader_ip: 208.80.154.156
diff --git a/manifests/site.pp b/manifests/site.pp
index 678af59..3db0c14 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -241,18 +241,11 @@
# DNS recursor, URL downloader
node 'chromium.wikimedia.org' {
- role dnsrecursor, url_downloader, ntp
+ role dnsrecursor, ntp
include standard
-
- $url_downloader_ip = hiera('url_downloader_ip')
interface::add_ip6_mapped { 'main':
interface => 'eth0',
- }
-
- interface::ip { 'url-downloader':
- interface => 'eth0',
- address => $url_downloader_ip,
}
}
@@ -1191,7 +1184,7 @@
# DNS recursor, URL downloader
node 'hydrogen.wikimedia.org' {
- role dnsrecursor, url_downloader, ntp
+ role dnsrecursor, ntp
include standard
interface::add_ip6_mapped { 'main':
--
To view, visit https://gerrit.wikimedia.org/r/305013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3aaeb41391106297c9cecb98e0242206cf02354e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
