Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/336715 )
Change subject: multiple roles: lint-fix base::firewall includes ...................................................................... multiple roles: lint-fix base::firewall includes Bug: T93645 Change-Id: I50f5fb0e546019a8eb9ce209db7181903e7e5dd1 --- M modules/role/manifests/dumps/zim.pp M modules/role/manifests/etherpad/server.pp M modules/role/manifests/gerrit/server.pp M modules/role/manifests/grafana/base.pp M modules/role/manifests/icinga.pp M modules/role/manifests/iegreview/app.pp M modules/role/manifests/installserver/dhcp.pp M modules/role/manifests/installserver/http.pp M modules/role/manifests/installserver/proxy.pp M modules/role/manifests/installserver/tftp.pp M modules/role/manifests/lists/server.pp M modules/role/manifests/microsites/annualreport.pp M modules/role/manifests/microsites/endowment.pp M modules/role/manifests/microsites/peopleweb.pp M modules/role/manifests/microsites/releases.pp M modules/role/manifests/microsites/transparency.pp M modules/role/manifests/mirrors.pp M modules/role/manifests/phabricator/main.pp M modules/role/manifests/requesttracker/server.pp M modules/role/manifests/requesttracker/upgradetest.pp 20 files changed, 21 insertions(+), 21 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/role/manifests/dumps/zim.pp b/modules/role/manifests/dumps/zim.pp index 372827b..b8fb4a9 100644 --- a/modules/role/manifests/dumps/zim.pp +++ b/modules/role/manifests/dumps/zim.pp @@ -4,7 +4,7 @@ system::role { 'dumps::zim': description => 'ZIM dumps' } include ::dumps::zim - include base::firewall + include ::base::firewall ferm::service { 'zim_dumps_http': proto => 'tcp', diff --git a/modules/role/manifests/etherpad/server.pp b/modules/role/manifests/etherpad/server.pp index 628a2a7..1a5be7b 100644 --- a/modules/role/manifests/etherpad/server.pp +++ b/modules/role/manifests/etherpad/server.pp @@ -1,7 +1,7 @@ # sets up an Etherpad lite server class role::etherpad::server{ include standard - include base::firewall + include ::base::firewall include passwords::etherpad_lite system::role { 'etherpad::server': diff --git a/modules/role/manifests/gerrit/server.pp b/modules/role/manifests/gerrit/server.pp index 0def276..25f3c5f 100644 --- a/modules/role/manifests/gerrit/server.pp +++ b/modules/role/manifests/gerrit/server.pp @@ -6,7 +6,7 @@ include standard include ::role::backup::host - include base::firewall + include ::base::firewall monitoring::service { 'gerrit_ssh': description => 'SSH access', diff --git a/modules/role/manifests/grafana/base.pp b/modules/role/manifests/grafana/base.pp index 746f969..66e93a4 100644 --- a/modules/role/manifests/grafana/base.pp +++ b/modules/role/manifests/grafana/base.pp @@ -21,7 +21,7 @@ include ::passwords::ldap::production - include base::firewall + include ::base::firewall class { '::grafana': config => { diff --git a/modules/role/manifests/icinga.pp b/modules/role/manifests/icinga.pp index 6d61360..4919ff4 100644 --- a/modules/role/manifests/icinga.pp +++ b/modules/role/manifests/icinga.pp @@ -33,7 +33,7 @@ include scap::dsh include mysql include standard - include base::firewall + include ::base::firewall # Dependencies for the check_keystone_roles script include ::openstack::clientlib diff --git a/modules/role/manifests/iegreview/app.pp b/modules/role/manifests/iegreview/app.pp index 74369d2..1b0eb4d 100644 --- a/modules/role/manifests/iegreview/app.pp +++ b/modules/role/manifests/iegreview/app.pp @@ -4,7 +4,7 @@ # class role::iegreview::app { - include base::firewall + include ::base::firewall class { '::iegreview': hostname => 'iegreview.wikimedia.org', diff --git a/modules/role/manifests/installserver/dhcp.pp b/modules/role/manifests/installserver/dhcp.pp index 2112d1e..f0865c1 100644 --- a/modules/role/manifests/installserver/dhcp.pp +++ b/modules/role/manifests/installserver/dhcp.pp @@ -8,7 +8,7 @@ include install_server::dhcp_server include standard - include base::firewall + include ::base::firewall ferm::rule { 'dhcp': rule => 'proto udp dport bootps { saddr $PRODUCTION_NETWORKS ACCEPT; }' diff --git a/modules/role/manifests/installserver/http.pp b/modules/role/manifests/installserver/http.pp index 1ae4fa4..ed6145c 100644 --- a/modules/role/manifests/installserver/http.pp +++ b/modules/role/manifests/installserver/http.pp @@ -8,7 +8,7 @@ include install_server::web_server include standard - include base::firewall + include ::base::firewall ferm::service { 'install_http': proto => 'tcp', diff --git a/modules/role/manifests/installserver/proxy.pp b/modules/role/manifests/installserver/proxy.pp index 08533a5..9515fb2 100644 --- a/modules/role/manifests/installserver/proxy.pp +++ b/modules/role/manifests/installserver/proxy.pp @@ -20,7 +20,7 @@ } include standard - include base::firewall + include ::base::firewall ferm::service { 'proxy': proto => 'tcp', diff --git a/modules/role/manifests/installserver/tftp.pp b/modules/role/manifests/installserver/tftp.pp index f831dda..66dd3fd 100644 --- a/modules/role/manifests/installserver/tftp.pp +++ b/modules/role/manifests/installserver/tftp.pp @@ -11,7 +11,7 @@ # Requires: # # Class['install_server::tftp_server'] -# Class['base::firewall'] +# Class['::base::firewall'] # Define['ferm::rule'] # # Sample Usage: @@ -23,7 +23,7 @@ } include standard - include base::firewall + include ::base::firewall include ::role::backup::host include install_server::tftp_server diff --git a/modules/role/manifests/lists/server.pp b/modules/role/manifests/lists/server.pp index e751747..95ec9db 100644 --- a/modules/role/manifests/lists/server.pp +++ b/modules/role/manifests/lists/server.pp @@ -1,6 +1,6 @@ class role::lists::server { include network::constants - include base::firewall + include ::base::firewall include standard system::role { 'role::lists::server': diff --git a/modules/role/manifests/microsites/annualreport.pp b/modules/role/manifests/microsites/annualreport.pp index 6a2bde9..93a43e5 100644 --- a/modules/role/manifests/microsites/annualreport.pp +++ b/modules/role/manifests/microsites/annualreport.pp @@ -6,7 +6,7 @@ system::role { 'role::microsites::annualreport': description => 'WMF Annual report server - annual.wikimedia.org' } include ::annualreport - include base::firewall + include ::base::firewall ferm::service { 'annualreport_http': proto => 'tcp', diff --git a/modules/role/manifests/microsites/endowment.pp b/modules/role/manifests/microsites/endowment.pp index f48b84e..5f1de03 100644 --- a/modules/role/manifests/microsites/endowment.pp +++ b/modules/role/manifests/microsites/endowment.pp @@ -5,7 +5,7 @@ system::role { 'role::microsites::endowment': description => 'endowment.wikimedia.org' } include ::endowment - include base::firewall + include ::base::firewall ferm::service { 'endowment_http': proto => 'tcp', diff --git a/modules/role/manifests/microsites/peopleweb.pp b/modules/role/manifests/microsites/peopleweb.pp index dd2b1d4..b6a9274 100644 --- a/modules/role/manifests/microsites/peopleweb.pp +++ b/modules/role/manifests/microsites/peopleweb.pp @@ -2,7 +2,7 @@ class role::microsites::peopleweb { include standard - include base::firewall + include ::base::firewall class { '::publichtml': sitename => 'people.wikimedia.org', diff --git a/modules/role/manifests/microsites/releases.pp b/modules/role/manifests/microsites/releases.pp index 830f206..1de4aec 100644 --- a/modules/role/manifests/microsites/releases.pp +++ b/modules/role/manifests/microsites/releases.pp @@ -1,7 +1,7 @@ class role::microsites::releases { system::role { 'releases': description => 'Releases webserver' } - include base::firewall + include ::base::firewall monitoring::service { 'http': description => 'HTTP', diff --git a/modules/role/manifests/microsites/transparency.pp b/modules/role/manifests/microsites/transparency.pp index 5fbe70b..07f071c 100644 --- a/modules/role/manifests/microsites/transparency.pp +++ b/modules/role/manifests/microsites/transparency.pp @@ -12,7 +12,7 @@ include ::passwords::misc::private_static_site include ::passwords::ldap::production - include base::firewall + include ::base::firewall $repo_dir = '/srv/org/wikimedia/TransparencyReport' $docroot = "${repo_dir}/build" diff --git a/modules/role/manifests/mirrors.pp b/modules/role/manifests/mirrors.pp index d8eea34..641d10a 100644 --- a/modules/role/manifests/mirrors.pp +++ b/modules/role/manifests/mirrors.pp @@ -9,7 +9,7 @@ include mirrors::serve include mirrors::tails - include base::firewall + include ::base::firewall include mirrors::ubuntu nrpe::monitor_service {'check_ubuntu_mirror': diff --git a/modules/role/manifests/phabricator/main.pp b/modules/role/manifests/phabricator/main.pp index 933f1e0..3c44a9a 100644 --- a/modules/role/manifests/phabricator/main.pp +++ b/modules/role/manifests/phabricator/main.pp @@ -16,7 +16,7 @@ include phabricator::monitoring include phabricator::mpm include ::lvs::realserver - include base::firewall + include ::base::firewall include ::apache::mod::remoteip # this site's misc-lb caching proxies hostnames diff --git a/modules/role/manifests/requesttracker/server.pp b/modules/role/manifests/requesttracker/server.pp index 41e007a..1c0f841 100644 --- a/modules/role/manifests/requesttracker/server.pp +++ b/modules/role/manifests/requesttracker/server.pp @@ -4,7 +4,7 @@ include passwords::misc::rt include standard - include base::firewall + include ::base::firewall class { '::requesttracker': apache_site => 'rt.wikimedia.org', diff --git a/modules/role/manifests/requesttracker/upgradetest.pp b/modules/role/manifests/requesttracker/upgradetest.pp index d2c8923..ad2c101 100644 --- a/modules/role/manifests/requesttracker/upgradetest.pp +++ b/modules/role/manifests/requesttracker/upgradetest.pp @@ -3,7 +3,7 @@ system::role { 'role::requesttracker::upgradetest': description => 'temp test setup for RT migration to jessie' } include standard - include base::firewall + include ::base::firewall include rsync::server # copy db dump from slave via rsync -- To view, visit https://gerrit.wikimedia.org/r/336715 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50f5fb0e546019a8eb9ce209db7181903e7e5dd1 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Juniorsys <juniorsys_wikime...@outlook.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits