Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/287072
Change subject: Revert "chromium: Remove url_downloader hiera and role"
......................................................................
Revert "chromium: Remove url_downloader hiera and role"
This reverts commit 6b14de1d260389d02920de14aa35751efc5b721c.
This reverts commit e33079506a682d9647aa1788ecdb6a9d2d3fc8fa.
Change-Id: Ie5ac509e77172a1655c7b4e269d155c8dfa0a495
---
A hieradata/hosts/chromium.yaml
M manifests/site.pp
2 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/72/287072/1
diff --git a/hieradata/hosts/chromium.yaml b/hieradata/hosts/chromium.yaml
new file mode 100644
index 0000000..f97625d
--- /dev/null
+++ b/hieradata/hosts/chromium.yaml
@@ -0,0 +1 @@
+url_downloader_ip: 208.80.154.156
diff --git a/manifests/site.pp b/manifests/site.pp
index 5c9be77..c1344ff 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -252,7 +252,14 @@
}
node /^(chromium|hydrogen)\.wikimedia\.org$/ {
- role dnsrecursor, ntp
+ if $::hostname == 'chromium' {
+ $url_downloader_ip = hiera('url_downloader_ip')
+ interface::ip { 'url-downloader':
+ interface => 'eth0',
+ address => $url_downloader_ip,
+ }
+ }
+ role dnsrecursor, url_downloader, ntp
include standard
interface::add_ip6_mapped { 'main':
--
To view, visit https://gerrit.wikimedia.org/r/287072
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5ac509e77172a1655c7b4e269d155c8dfa0a495
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
