Alexandros Kosiaris has uploaded a new change for review. https://gerrit.wikimedia.org/r/190817
Change subject: Move url_downloader_ip configuration to hiera ...................................................................... Move url_downloader_ip configuration to hiera Change-Id: I8c8b709c02398438fc72066631034f8b6d47bf96 --- A hieradata/hosts/helium.yaml M manifests/role/url_downloader.pp M manifests/site.pp 3 files changed, 7 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/17/190817/1 diff --git a/hieradata/hosts/helium.yaml b/hieradata/hosts/helium.yaml new file mode 100644 index 0000000..f97625d --- /dev/null +++ b/hieradata/hosts/helium.yaml @@ -0,0 +1 @@ +url_downloader_ip: 208.80.154.156 diff --git a/manifests/role/url_downloader.pp b/manifests/role/url_downloader.pp index abfcc06..61a09aa 100644 --- a/manifests/role/url_downloader.pp +++ b/manifests/role/url_downloader.pp @@ -21,7 +21,7 @@ # $url_downlader_ip = '10.10.10.10' # A public IP really # include role::url_downloader # } -class role::url_downloader { +class role::url_downloader($url_downloader_ip) { system::role { 'url_downloader': description => 'Upload-by-URL proxy' } diff --git a/manifests/site.pp b/manifests/site.pp index 9867055..9794989 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -421,12 +421,14 @@ include role::dns::recursor if $::hostname == 'chromium' { + $url_downloader_ip = hiera('url_downloader_ip') interface::ip { 'url-downloader': interface => 'eth0', - address => '208.80.154.156', + address => $url_downloader_ip, } - $url_downloader_ip = '208.80.154.156' - include role::url_downloader + class { 'role::url_downloader': + url_downloader_ip => $url_downloader_ip + } } interface::add_ip6_mapped { 'main': -- To view, visit https://gerrit.wikimedia.org/r/190817 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8c8b709c02398438fc72066631034f8b6d47bf96 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits