Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394625 )
Change subject: wmcs: move standard includes from site to roles ...................................................................... wmcs: move standard includes from site to roles This should be no-op on everything but cleans up site.pp and gets us "wmf-style: total violations delta -7". Let me know if it's too much change at once but i can compile it too of course. Change-Id: I491de33e594c67b34b9e410f42ef8da1d519c79d --- M manifests/site.pp M modules/role/manifests/wmcs/openstack/labtest/web.pp M modules/role/manifests/wmcs/openstack/labtestn/services.pp M modules/role/manifests/wmcs/openstack/main/control.pp M modules/role/manifests/wmcs/openstack/main/net.pp M modules/role/manifests/wmcs/openstack/main/net_standby.pp 6 files changed, 5 insertions(+), 6 deletions(-) Approvals: Andrew Bogott: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/manifests/site.pp b/manifests/site.pp index c3d9663..0763a89 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1059,7 +1059,6 @@ node /labtestservices200[23]\.wikimedia\.org/ { role(wmcs::openstack::labtestn::services) include ::base::firewall - include ::standard interface::add_ip6_mapped { 'main': } } @@ -1207,7 +1206,6 @@ role(wmcs::openstack::main::control) include ::base::firewall - include ::standard include ::ldap::role::client::labs } @@ -1221,7 +1219,6 @@ role(wmcs::openstack::main::control) include ::base::firewall - include ::standard include ::ldap::role::client::labs } @@ -1232,7 +1229,6 @@ role(wmcs::openstack::labtest::web, mariadb::wikitech) include ::base::firewall - include ::standard include ::ldap::role::client::labs interface::add_ip6_mapped { 'main': } @@ -1254,7 +1250,6 @@ node 'labnet1001.eqiad.wmnet' { role(wmcs::openstack::main::net) - include ::standard } # role spare until pushed into service via T165779 @@ -1265,7 +1260,6 @@ node 'labnet1002.eqiad.wmnet' { role(wmcs::openstack::main::net_standby) - include ::standard } node 'labnodepool1001.eqiad.wmnet' { diff --git a/modules/role/manifests/wmcs/openstack/labtest/web.pp b/modules/role/manifests/wmcs/openstack/labtest/web.pp index 28d32a5..f45d26f 100644 --- a/modules/role/manifests/wmcs/openstack/labtest/web.pp +++ b/modules/role/manifests/wmcs/openstack/labtest/web.pp @@ -1,5 +1,6 @@ class role::wmcs::openstack::labtest::web { system::role { $name: } + include ::standard include ::profile::openstack::labtest::cloudrepo include ::profile::openstack::labtest::clientlib include ::profile::openstack::labtest::observerenv diff --git a/modules/role/manifests/wmcs/openstack/labtestn/services.pp b/modules/role/manifests/wmcs/openstack/labtestn/services.pp index eefbae5..4511a93 100644 --- a/modules/role/manifests/wmcs/openstack/labtestn/services.pp +++ b/modules/role/manifests/wmcs/openstack/labtestn/services.pp @@ -1,4 +1,5 @@ class role::wmcs::openstack::labtestn::services { system::role { $name: } + include ::standard include ::profile::openstack::labtestn::cloudrepo } diff --git a/modules/role/manifests/wmcs/openstack/main/control.pp b/modules/role/manifests/wmcs/openstack/main/control.pp index f65d901..ae03aa8 100644 --- a/modules/role/manifests/wmcs/openstack/main/control.pp +++ b/modules/role/manifests/wmcs/openstack/main/control.pp @@ -1,5 +1,6 @@ class role::wmcs::openstack::main::control { system::role { $name: } + include ::standard include ::profile::openstack::main::observerenv include ::profile::openstack::main::rabbitmq include ::profile::openstack::main::keystone::service diff --git a/modules/role/manifests/wmcs/openstack/main/net.pp b/modules/role/manifests/wmcs/openstack/main/net.pp index 7441ab6..f440ab9 100644 --- a/modules/role/manifests/wmcs/openstack/main/net.pp +++ b/modules/role/manifests/wmcs/openstack/main/net.pp @@ -1,5 +1,6 @@ class role::wmcs::openstack::main::net { system::role { $name: } + include ::standard include ::profile::openstack::main::cloudrepo include ::profile::openstack::main::clientlib include ::profile::openstack::main::observerenv diff --git a/modules/role/manifests/wmcs/openstack/main/net_standby.pp b/modules/role/manifests/wmcs/openstack/main/net_standby.pp index 9eccd60..7ea21b4 100644 --- a/modules/role/manifests/wmcs/openstack/main/net_standby.pp +++ b/modules/role/manifests/wmcs/openstack/main/net_standby.pp @@ -1,5 +1,6 @@ class role::wmcs::openstack::main::net_standby { system::role { $name: } + include ::standard include ::profile::openstack::main::cloudrepo include ::profile::openstack::main::clientlib include ::profile::openstack::main::observerenv -- To view, visit https://gerrit.wikimedia.org/r/394625 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I491de33e594c67b34b9e410f42ef8da1d519c79d Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Rush <r...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits