Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315923
Change subject: kubernetes: install kubernetes1001-4 as worker nodes
......................................................................
kubernetes: install kubernetes1001-4 as worker nodes
Bug: T147933
Change-Id: I69f3baec008ed38c54b4d668d5115dd7c4d598df
---
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
M modules/role/manifests/kubernetes/worker.pp
4 files changed, 28 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/315923/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 1765b3c..a603197 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1401,6 +1401,10 @@
include standard
}
+node /kubernetes100[1-4].eqiad.wmnet/ {
+ role(kubernetes::worker)
+}
+
node 'labcontrol1001.wikimedia.org' {
role(labs::openstack::nova::controller,
labs::puppetmaster,
diff --git a/modules/install_server/files/autoinstall/netboot.cfg
b/modules/install_server/files/autoinstall/netboot.cfg
index 0294424..fc5157c 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -84,6 +84,7 @@
graphite200[12]) echo partman/graphite.cfg ;; \
kafka1013|kafka1014|kafka1020) echo partman/raid1-30G.cfg ;; \
kafka100[1-2]|kafka200[1-2]|stat1004) echo
partman/raid10-gpt-srv-ext4.cfg ;; \
+ kubernetes100[1-4]) echo partman/docker-host.cfg ;; \
auth[1-2]001|contint1001|einsteinium|labcontrol100[1-2]|labnodepool1001|lead|mira|neodymium|oresrdb100[1-2]|phab2001|rdb200[1-6]|wmf474[7-9]|wmf4750)
echo partman/raid1-lvm-ext4-srv.cfg ;; \
labmon1001) echo partman/raid10-gpt-srv-lvm-ext4.cfg ;; \
labnet100[1-2]) echo partman/lvm.cfg ;; \
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index a826674..7cdb032 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2633,6 +2633,26 @@
fixed-address kafka2002.codfw.wmnet;
}
+host kubernetes1001 {
+ hardware ethernet 18:66:DA:56:64:A1;
+ fixed-address kubernetes1001.eqiad.wmnet;
+}
+
+host kubernetes1002 {
+ hardware ethernet 18:66:DA:56:79:BC;
+ fixed-address kubernetes1002.eqiad.wmnet;
+}
+
+host kubernetes1003 {
+ hardware ethernet 18:66:DA:56:43:7E;
+ fixed-address kubernetes1003.eqiad.wmnet;
+}
+
+host kubernetes1004 {
+ hardware ethernet 18:66:DA:56:79:7A;
+ fixed-address kubernetes1004.eqiad.wmnet;
+}
+
host labcontrol1001 {
hardware ethernet 84:2b:2b:77:cf:ca;
fixed-address labcontrol1001.wikimedia.org;
diff --git a/modules/role/manifests/kubernetes/worker.pp
b/modules/role/manifests/kubernetes/worker.pp
index bcf2f4a..efd7d8e 100644
--- a/modules/role/manifests/kubernetes/worker.pp
+++ b/modules/role/manifests/kubernetes/worker.pp
@@ -1,4 +1,7 @@
class role::kubernetes::worker {
+ include standard
+ include base::firewall
+
# Sets up docker on the machine
include ::profile::docker::engine
}
--
To view, visit https://gerrit.wikimedia.org/r/315923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69f3baec008ed38c54b4d668d5115dd7c4d598df
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
