Alex Monk has uploaded a new change for review. https://gerrit.wikimedia.org/r/319249
Change subject: deployment-prep: Fix deployment access.conf rules to allow all deployment servers ...................................................................... deployment-prep: Fix deployment access.conf rules to allow all deployment servers Not just tin. Also simplifies things. Change-Id: I76bc9348453e19617e48e464712e26370932bc4d --- M modules/beta/manifests/deployaccess.pp M modules/role/manifests/beta/mediawiki.pp 2 files changed, 5 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/49/319249/1 diff --git a/modules/beta/manifests/deployaccess.pp b/modules/beta/manifests/deployaccess.pp index dcd7114..3c7da66 100644 --- a/modules/beta/manifests/deployaccess.pp +++ b/modules/beta/manifests/deployaccess.pp @@ -1,12 +1,9 @@ # TODO: remove this if https://phabricator.wikimedia.org/T121721 # is fixed. -class beta::deployaccess( - $bastion_ip = '10.68.21.205', # ip of deployment-tin -) { - +class beta::deployaccess { + $ips = join($network::constants::special_hosts[$::realm]['deployment_hosts'], ' ') security::access::config { 'beta-allow-mwdeploy': - content => "+ : deploy-service mwdeploy : ${bastion_ip}\n", + content => "+ : deploy-service mwdeploy : ${ips}\n", priority => 50, } - } diff --git a/modules/role/manifests/beta/mediawiki.pp b/modules/role/manifests/beta/mediawiki.pp index 42a91d2..cb47c33 100644 --- a/modules/role/manifests/beta/mediawiki.pp +++ b/modules/role/manifests/beta/mediawiki.pp @@ -5,10 +5,9 @@ class role::beta::mediawiki { include base::firewall - $deployment_host = hiera('scap::deployment_server') - $deployment_ip = ipresolve($deployment_host, 4, $::nameservers[0]) + $ips = join($network::constants::special_hosts[$::realm]['deployment_hosts'], ' ') security::access::config { 'scap-allow-mwdeploy': - content => "+ : mwdeploy : ${deployment_ip}\n", + content => "+ : mwdeploy : ${ips}\n", priority => 60, } } -- To view, visit https://gerrit.wikimedia.org/r/319249 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76bc9348453e19617e48e464712e26370932bc4d Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Alex Monk <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
