Cmjohnson has submitted this change and it was merged.
Change subject: Updating puppet entries to reflect server name changes
(analytics to virts)
......................................................................
Updating puppet entries to reflect server name changes (analytics to virts)
Change-Id: Id725ab4d8c90c240f74f11ca0e14e1b519064a9c
---
M files/dsh/group/analytics
M manifests/misc/blogs.pp
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
4 files changed, 25 insertions(+), 45 deletions(-)
Approvals:
Cmjohnson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dsh/group/analytics b/files/dsh/group/analytics
index ed8b0be..08a9399 100644
--- a/files/dsh/group/analytics
+++ b/files/dsh/group/analytics
@@ -1,10 +1,4 @@
-analytics1001
-analytics1002
analytics1003
analytics1004
-analytics1005
-analytics1006
-analytics1007
-analytics1008
analytics1009
analytics1010
diff --git a/manifests/misc/blogs.pp b/manifests/misc/blogs.pp
index 770484a..a677d7c 100644
--- a/manifests/misc/blogs.pp
+++ b/manifests/misc/blogs.pp
@@ -74,10 +74,6 @@
varnish::logging { 'emery' : listener_address =>
'208.80.152.184' }
varnish::logging { 'multicast_relay' : listener_address =>
'208.80.154.73', port => '8419' }
- # Capture blog traffic logs on its own stream in analytics cluster.
- # 208.80.154.154 == analytics1001.wikimedia.org
- varnish::logging { 'analytics-blog' : listener_address =>
'208.80.154.154', port => '8411' }
-
include backup::host
backup::set { 'srv-org-wikimedia': }
diff --git a/manifests/site.pp b/manifests/site.pp
index 532948a..6d06360 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -93,20 +93,9 @@
interface::add_ip6_mapped { "main": }
}
-# analytics1001.wikimedia.org has a public IP
-node "analytics1001.wikimedia.org" {
- include role::analytics
-}
-
# analytics1003 and analytics1004 are temporarily
# test Kafka Brokers.
node /analytics100[34]\.wikimedia\.org/ {
- include role::analytics
-}
-
-# Unassigned Cisco nodes.
-# NOTE: analytics1002 still need reinstalled as of 2013-08-26
-node /analytics100[2568]\.eqiad\.wmnet/ {
include role::analytics
}
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 74d30ac..d12617f 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -3,15 +3,6 @@
#### puppet:///files/dhcpd/linux-host-entries.ttyS0-115200
######################################################################
-host analytics1001 {
- hardware ethernet 88:43:e1:c2:99:8e;
- fixed-address analytics1001.wikimedia.org;
-}
-
-host analytics1002 {
- hardware ethernet 00:22:bd:d3:60:58;
- fixed-address analytics1002.eqiad.wmnet;
-}
host analytics1003 {
hardware ethernet 88:43:e1:c2:99:48;
@@ -23,24 +14,9 @@
fixed-address analytics1004.wikimedia.org;
}
-host analytics1005 {
- hardware ethernet 88:43:e1:c2:53:9c;
- fixed-address analytics1005.eqiad.wmnet;
-}
-
-host analytics1006 {
- hardware ethernet 88:43:e1:c2:85:b4;
- fixed-address analytics1006.eqiad.wmnet;
-}
-
host analytics1007 {
hardware ethernet ;
fixed-address analytics1007.eqiad.wmnet;
-}
-
-host analytics1008 {
- hardware ethernet 88:43:e1:c2:50:7e;
- fixed-address analytics1008.eqiad.wmnet;
}
host analytics1009 {
@@ -182,3 +158,28 @@
hardware ethernet 88:43:E1:C2:7B:6C;
fixed-address virt15.pmtpa.wmnet;
}
+
+host virt1001 {
+ hardware ethernet 88:43:e1:c2:99:8e;
+ fixed-address virt1001.wikimedia.org;
+}
+
+host virt1002 {
+ hardware ethernet 00:22:bd:d3:60:58;
+ fixed-address virt1002.eqiad.wmnet;
+}
+
+host virt1003 {
+ hardware ethernet 88:43:e1:c2:53:9c;
+ fixed-address virt1003.eqiad.wmnet;
+}
+
+host virt1008 {
+ hardware ethernet 88:43:e1:c2:85:b4;
+ fixed-address virt1008.eqiad.wmnet;
+}
+
+host virt1009 {
+ hardware ethernet 88:43:e1:c2:50:7e;
+ fixed-address virt1009.eqiad.wmnet;
+}
--
To view, visit https://gerrit.wikimedia.org/r/103380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id725ab4d8c90c240f74f11ca0e14e1b519064a9c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <[email protected]>
Gerrit-Reviewer: Cmjohnson <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
