RobH has submitted this change and it was merged.
Change subject: europium added
......................................................................
europium added
Change-Id: I22ce3d2a47dc800f8c89af54727eae9f55518ac3
---
M files/autoinstall/netboot.cfg
M files/dhcpd/linux-host-entries.ttyS1-115200
M manifests/site.pp
3 files changed, 31 insertions(+), 1 deletion(-)
Approvals:
RobH: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/autoinstall/netboot.cfg b/files/autoinstall/netboot.cfg
index 9c16fcd..1171e01 100644
--- a/files/autoinstall/netboot.cfg
+++ b/files/autoinstall/netboot.cfg
@@ -38,7 +38,7 @@
calcium|helium|potassium|tmh1001|tmh1002) echo
partman/raid1-1partition.cfg ;; \
capella) echo partman/lvs.cfg ;; \
cp102[1-9]|cp103[0-6]|cp104[1-4]|cp30[0-9][0-9]|sq6[7-9]|sq70)
echo partman/raid1-varnish.cfg ;; \
-
barium|caesium|celsus|cerium|colby|constable|kuo|lardner|mexia|neodymium|palladium|promethium|strontium|titanium|tola|xenon|wtp100[1-4])
echo partman/lvm.cfg ;; \
+
barium|caesium|celsus|cerium|colby|constable|europium|kuo|lardner|mexia|neodymium|palladium|promethium|strontium|titanium|tola|xenon|wtp100[1-4])
echo partman/lvm.cfg ;; \
lvs*) echo partman/lvs.cfg ;; \
ekrem) echo partman/raid1.cfg ;; \
lithium|beryllium) echo partman/mw.cfg ;; \
diff --git a/files/dhcpd/linux-host-entries.ttyS1-115200
b/files/dhcpd/linux-host-entries.ttyS1-115200
index 7f15d00..add8d7e 100644
--- a/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -1130,6 +1130,11 @@
fixed-address es1010.eqiad.wmnet;
}
+host europium {
+ hardware ethernet 90:B1:1C:00:B1:93;
+ fixed-address europium.wikimedia.org;
+}
+
host fluorine {
hardware ethernet 78:2b:cb:08:ba:a9;
fixed-address fluorine.eqiad.wmnet;
diff --git a/manifests/site.pp b/manifests/site.pp
index d9efb8a..845e4f9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -649,6 +649,30 @@
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/ {
@@ -808,6 +832,7 @@
}
# base_analytics_logging_node is defined in role/logging.pp
+
node "locke.wikimedia.org" inherits "base_analytics_logging_node" {
include
accounts::dsc,
--
To view, visit https://gerrit.wikimedia.org/r/52909
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22ce3d2a47dc800f8c89af54727eae9f55518ac3
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
