[MediaWiki-commits] [Gerrit] operations/puppet[production]: install: rename tftp_server role to just tftp and further cl...
Dzahn has submitted this change and it was merged. Change subject: install: rename tftp_server role to just tftp and further cleanup .. install: rename tftp_server role to just tftp and further cleanup Bug: T132757 Change-Id: I765ea969c5057bc82cdb213fa120bdd0b2f83bae --- M manifests/site.pp M modules/role/manifests/installserver.pp R modules/role/manifests/installserver/tftp.pp 3 files changed, 20 insertions(+), 14 deletions(-) Approvals: Dzahn: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index ee26ed8..8b62305 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -178,7 +178,9 @@ # Bastion in the Netherlands node 'bast3001.wikimedia.org' { -role(bastionhost::general, installserver::tftp_server, prometheus::ops) +role(bastionhost::general, +installserver::tftp, +prometheus::ops) interface::add_ip6_mapped { 'main': interface => 'eth0', } @@ -189,7 +191,9 @@ # Bastion in California node 'bast4001.wikimedia.org' { -role(bastionhost::general, ipmi::mgmt, installserver::tftp_server, +role(bastionhost::general, +ipmi::mgmt, +installserver::tftp, prometheus::ops) interface::add_ip6_mapped { 'main': interface => 'eth0', } @@ -224,7 +228,7 @@ # DHCP / TFTP node 'carbon.wikimedia.org' { role(installserver, -installserver::tftp_server, +installserver::tftp, installserver::dhcp, installserver::http, installserver::proxy, @@ -1299,7 +1303,10 @@ # partially replaces carbon (T132757) node 'install1001.wikimedia.org' { -role(installserver::tftp_server, installserver::dhcp, aptrepo::wikimedia) +role(installserver::tftp, +installserver::dhcp, +aptrepo::wikimedia) + $cluster = 'misc' interface::add_ip6_mapped { 'main': @@ -1308,7 +1315,10 @@ } node 'install2001.wikimedia.org' { -role(installserver::tftp_server, installserver::dhcp, aptrepo::wikimedia) +role(installserver::tftp, +installserver::dhcp, +aptrepo::wikimedia) + $cluster = 'misc' interface::add_ip6_mapped { 'main': diff --git a/modules/role/manifests/installserver.pp b/modules/role/manifests/installserver.pp index e80d974..0cf77e7 100644 --- a/modules/role/manifests/installserver.pp +++ b/modules/role/manifests/installserver.pp @@ -1,8 +1,4 @@ class role::installserver { -system::role { 'role::install_server': -description => 'WMF Install server. APT repo, Forward Caching, TFTP, \ -DHCP and Web server', -} include standard include role::backup::host diff --git a/modules/role/manifests/installserver/tftp_server.pp b/modules/role/manifests/installserver/tftp.pp similarity index 71% rename from modules/role/manifests/installserver/tftp_server.pp rename to modules/role/manifests/installserver/tftp.pp index e689662..ce21e0b 100644 --- a/modules/role/manifests/installserver/tftp_server.pp +++ b/modules/role/manifests/installserver/tftp.pp @@ -1,4 +1,4 @@ -# Class: role::install_server::tftp_server +# Class: role::installserver::tftp # # A WMF role class used to install all the install_server TFTP stuff # @@ -10,15 +10,15 @@ # # Requires: # -# Class['install-_server::tftp_server'] +# Class['install_server::tftp_server'] # Class['base::firewall'] # Define['ferm::rule'] # # Sample Usage: -# include role::installserver::tftp_server +# role(installserver::tftp) -class role::installserver::tftp_server { -system::role { 'role::install_server::tftp_server': +class role::installserver::tftp { +system::role { 'role::installserver::tftp': description => 'WMF TFTP server', } -- To view, visit https://gerrit.wikimedia.org/r/325725 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I765ea969c5057bc82cdb213fa120bdd0b2f83bae Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn Gerrit-Reviewer: Dzahn Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: install: rename tftp_server role to just tftp and further cl...
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/325725 Change subject: install: rename tftp_server role to just tftp and further cleanup .. install: rename tftp_server role to just tftp and further cleanup Change-Id: I765ea969c5057bc82cdb213fa120bdd0b2f83bae --- M manifests/site.pp M modules/role/manifests/installserver.pp R modules/role/manifests/installserver/tftp.pp 3 files changed, 20 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/25/325725/1 diff --git a/manifests/site.pp b/manifests/site.pp index ee26ed8..8b62305 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -178,7 +178,9 @@ # Bastion in the Netherlands node 'bast3001.wikimedia.org' { -role(bastionhost::general, installserver::tftp_server, prometheus::ops) +role(bastionhost::general, +installserver::tftp, +prometheus::ops) interface::add_ip6_mapped { 'main': interface => 'eth0', } @@ -189,7 +191,9 @@ # Bastion in California node 'bast4001.wikimedia.org' { -role(bastionhost::general, ipmi::mgmt, installserver::tftp_server, +role(bastionhost::general, +ipmi::mgmt, +installserver::tftp, prometheus::ops) interface::add_ip6_mapped { 'main': interface => 'eth0', } @@ -224,7 +228,7 @@ # DHCP / TFTP node 'carbon.wikimedia.org' { role(installserver, -installserver::tftp_server, +installserver::tftp, installserver::dhcp, installserver::http, installserver::proxy, @@ -1299,7 +1303,10 @@ # partially replaces carbon (T132757) node 'install1001.wikimedia.org' { -role(installserver::tftp_server, installserver::dhcp, aptrepo::wikimedia) +role(installserver::tftp, +installserver::dhcp, +aptrepo::wikimedia) + $cluster = 'misc' interface::add_ip6_mapped { 'main': @@ -1308,7 +1315,10 @@ } node 'install2001.wikimedia.org' { -role(installserver::tftp_server, installserver::dhcp, aptrepo::wikimedia) +role(installserver::tftp, +installserver::dhcp, +aptrepo::wikimedia) + $cluster = 'misc' interface::add_ip6_mapped { 'main': diff --git a/modules/role/manifests/installserver.pp b/modules/role/manifests/installserver.pp index e80d974..0cf77e7 100644 --- a/modules/role/manifests/installserver.pp +++ b/modules/role/manifests/installserver.pp @@ -1,8 +1,4 @@ class role::installserver { -system::role { 'role::install_server': -description => 'WMF Install server. APT repo, Forward Caching, TFTP, \ -DHCP and Web server', -} include standard include role::backup::host diff --git a/modules/role/manifests/installserver/tftp_server.pp b/modules/role/manifests/installserver/tftp.pp similarity index 71% rename from modules/role/manifests/installserver/tftp_server.pp rename to modules/role/manifests/installserver/tftp.pp index e689662..ce21e0b 100644 --- a/modules/role/manifests/installserver/tftp_server.pp +++ b/modules/role/manifests/installserver/tftp.pp @@ -1,4 +1,4 @@ -# Class: role::install_server::tftp_server +# Class: role::installserver::tftp # # A WMF role class used to install all the install_server TFTP stuff # @@ -10,15 +10,15 @@ # # Requires: # -# Class['install-_server::tftp_server'] +# Class['install_server::tftp_server'] # Class['base::firewall'] # Define['ferm::rule'] # # Sample Usage: -# include role::installserver::tftp_server +# role(installserver::tftp) -class role::installserver::tftp_server { -system::role { 'role::install_server::tftp_server': +class role::installserver::tftp { +system::role { 'role::installserver::tftp': description => 'WMF TFTP server', } -- To view, visit https://gerrit.wikimedia.org/r/325725 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I765ea969c5057bc82cdb213fa120bdd0b2f83bae Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits