Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/337197 )
Change subject: install: remove roles from carbon, demote to spare
......................................................................
install: remove roles from carbon, demote to spare
carbon will be decom'ed in about a week but until then
all roles should be removed and it should be using role::spare
per the decom steps from server lifecycle.
Bug: T158020
Change-Id: Ib58bd8ad52a2047e488aca64672f445daf62dc5b
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
2 files changed, 3 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index d5dd39e..be71014 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -211,16 +211,9 @@
include ::openstack::horizon::puppetpanel
}
-# DHCP / TFTP
+# ex-installserver, replaced by install1002/install2002, to be decom'ed
(T158020)
node 'carbon.wikimedia.org' {
- role(installserver::tftp,
- installserver::dhcp,
- installserver::http,
- installserver::proxy,
- installserver::preseed,
- aptrepo::wikimedia)
-
- $cluster = 'misc'
+ role(spare)
interface::add_ip6_mapped { 'main':
interface => 'eth0',
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index d7e77aa..c5133e8 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -58,7 +58,7 @@
boron) echo partman/lvm.cfg ;; \
helium|tmh1002|hydrogen|chromium) echo partman/raid1-1partition.cfg ;;
\
lawrencium|netmon1001|notebook1001|notebook1002|stat1002|tungsten|labsdb100[0-9]|labsdb101[0-1])
echo partman/db.cfg ;; \
- carbon|stat1003) echo partman/raid5-gpt-lvm.cfg ;; \
+ stat1003) echo partman/raid5-gpt-lvm.cfg ;; \
cerium|praseodymium|xenon) echo partman/cassandrahosts-3ssd.cfg ;; \
conf100[123]) echo partman/raid1-lvm-conf.cfg ;; \
conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
--
To view, visit https://gerrit.wikimedia.org/r/337197
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib58bd8ad52a2047e488aca64672f445daf62dc5b
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
