Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/236030
Change subject: Remove etcd100X from manifests
......................................................................
Remove etcd100X from manifests
Shutdown for some time now, unused
Bug: T110030
Change-Id: Iaa4f21e247690bcb52d60f86899f121e36e40c74
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
3 files changed, 0 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/30/236030/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 9424680..99eb05d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -978,14 +978,6 @@
}
-# Etcd distributed kv store
-node /^etcd100[1-3]\.eqiad\.wmnet$/ {
- include standard
- base::service_unit{ 'etcd':
- ensure => absent,
- }
-}
-
# Etherpad (virtual machine)
node 'etherpad1001.eqiad.wmnet' {
include base::firewall
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index fda3fd2..b9653cf 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -67,7 +67,6 @@
eeden|hooft|maerlant|multatuli|nescio) echo
partman/raid1-1partition.cfg ;; \
einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
elastic10[0-2][0-9]|elastic103[0-1]) echo
partman/elasticsearch.cfg ;; \
- etcd100[1-9]) echo partman/lvm-etcd.cfg virtual.cfg;; \
bromine|etherpad[12]001|fermium|krypton|planet1001) echo
partman/flat.cfg virtual.cfg ;; \
eventlog[1-2]001|labcontrol2001|ocg100[1-3]|sc[ab]100[1-2])
echo partman/raid1.cfg ;; \
francium|tungsten) echo partman/raid10-gpt.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index 31cae90..b2e5961 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -55,27 +55,6 @@
fixed-address labsdb1003.eqiad.wmnet;
}
-host etcd1001 {
- hardware ethernet AA:00:00:68:8C:B4;
- fixed-address etcd1001.eqiad.wmnet;
- option pxelinux.pathprefix "jessie-installer/";
- filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
-host etcd1002 {
- hardware ethernet AA:00:00:44:DD:FE;
- fixed-address etcd1002.eqiad.wmnet;
- option pxelinux.pathprefix "jessie-installer/";
- filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
-host etcd1003 {
- hardware ethernet AA:00:00:C9:3E:BD;
- fixed-address etcd1003.eqiad.wmnet;
- option pxelinux.pathprefix "jessie-installer/";
- filename "jessie-installer/debian-installer/amd64/pxelinux.0";
-}
-
host etherpad1001 {
hardware ethernet AA:00:00:EE:AD:01;
fixed-address etherpad1001.eqiad.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/236030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa4f21e247690bcb52d60f86899f121e36e40c74
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
