RobH has submitted this change and it was merged.
Change subject: gadolinium replacing europium/locke
......................................................................
gadolinium replacing europium/locke
Change-Id: I56566dc0c19ea6efc47ff7362840e3b087641967
---
M files/dhcpd/linux-host-entries.ttyS1-115200
M manifests/site.pp
2 files changed, 11 insertions(+), 25 deletions(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 5106476..1db5f03 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1145,6 +1145,11 @@
fixed-address gallium.wikimedia.org;
}
+host gadolinium {
+ hardware ethernet 90:B1:1C:17:1B:8A;
+ fixed-address gadolinium.wikimedia.org;
+}
+
host gurvin {
hardware ethernet 84:2b:2b:06:49:51;
fixed-address gurvin.wikimedia.org;
diff --git a/manifests/site.pp b/manifests/site.pp
index 73a0e24..a512855 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -649,31 +649,6 @@
class { 'misc::fundraising::backup::archive_sync': hour => [0,8,16],
minute => 5 }
}
-node "europium.wikimedia.org" inherits "base_analytics_logging_node" {
- include
- accounts::dsc,
- accounts::datasets,
- accounts::dandreescu
- # misc::udp2log::utilities,
- # misc::udp2log
-
- # locke's udp2log instance stores logs
- # mainly in /a/squid.
- # TODO: Move log_directory to /var/log/udp2log
- # misc::udp2log::instance { "locke": log_directory => "/a/squid" }
-
- # fundraising banner log pipeline
- # include misc::fundraising::udp2log_rotation
-
- # Set up an rsync daemon module for udp2log logrotated
- # archives. This allows stat1 to copy logs from the
- # logrotated archive directory
- # class { "misc::udp2log::rsyncd":
- # path => "/a/squid",
- # require => Misc::Udp2log::Instance["locke"],
- # }
-}
-
# es1 equad
node /es100[1-4]\.eqiad\.wmnet/ {
include role::coredb::es1
@@ -774,6 +749,12 @@
class { "role::ldap::client::labs": ldapincludes => $ldapincludes }
}
+node "gadolinium.wikimedia.org" inherits "base_analytics_logging_node" {
+ include
+ accounts::dsc,
+ accounts::datasets,
+ accounts::dandreescu
+}
node "gallium.wikimedia.org" {
$cluster = "misc"
--
To view, visit https://gerrit.wikimedia.org/r/53401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56566dc0c19ea6efc47ff7362840e3b087641967
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
