Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: memcached: install one host in codfw for testing
......................................................................
memcached: install one host in codfw for testing
Change-Id: I3122ba17ae5fbe434f3896d3e46ef4eb523b4063
---
A hieradata/role/codfw/memcached.yaml
M manifests/site.pp
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
3 files changed, 21 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/codfw/memcached.yaml
b/hieradata/role/codfw/memcached.yaml
new file mode 100644
index 0000000..583d5d0
--- /dev/null
+++ b/hieradata/role/codfw/memcached.yaml
@@ -0,0 +1 @@
+redis::dir: "/srv/redis"
diff --git a/manifests/site.pp b/manifests/site.pp
index cbe9abb..058ca58 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1717,6 +1717,15 @@
include redis::ganglia
}
+
+node /^mc20[01][0-9]\.codfw\.wmnet/ {
+ role memcached
+ include admin
+ include password::redis
+ include redis
+ include redis::ganglia
+}
+
node /^rdb100[1-4]\.eqiad\.wmnet/ {
$ganglia_aggregator = true
role db::redis
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 bd3ee4f..85c0ffa 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2047,10 +2047,17 @@
}
host mc1018 {
- hardware ethernet 00:10:18:ef:f6:d0;
- fixed-address mc1018.eqiad.wmnet;
- option pxelinux.pathprefix "precise-installer/";
- filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
+ hardware ethernet 00:10:18:ef:f6:d0;
+ fixed-address mc1018.eqiad.wmnet;
+ option pxelinux.pathprefix "precise-installer/";
+ filename "precise-installer/ubuntu-installer/amd64/pxelinux.0";
+}
+
+host mc2002 {
+ hardware ethernet 90:e2:ba:19:4e:c9;
+ fixed-address mc2002.codfw.wmnet;
+ option pxelinux.pathprefix "jessie-installer/";
+ filename "jessie-installer/debian-installer/amd64/pxelinux.0";
}
host ms1001 {
--
To view, visit https://gerrit.wikimedia.org/r/191562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3122ba17ae5fbe434f3896d3e46ef4eb523b4063
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
