Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349385 )
Change subject: role::configcluster: reconfigure etcd replication
......................................................................
role::configcluster: reconfigure etcd replication
As per the immediate plan outlied in T159687, replicate directly to
/conftool in order to make it easy to switch to the codfw cluster.
So we replicate /conftool => /conftool, adding the --strip option to
have 1:1 replication
Bug: T159687
Change-Id: Iaa08b0362d3a18b1a504b1e45c8cfa4de8b0b51f
---
M hieradata/role/codfw/configcluster.yaml
M modules/etcdmirror/templates/initscripts/etcd-mirror.systemd.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/codfw/configcluster.yaml
b/hieradata/role/codfw/configcluster.yaml
index 234e005..1219b48 100644
--- a/hieradata/role/codfw/configcluster.yaml
+++ b/hieradata/role/codfw/configcluster.yaml
@@ -8,6 +8,6 @@
- conf1001.eqiad.wmnet
- conf1002.eqiad.wmnet
- conf1003.eqiad.wmnet
-profile::etcd::replication::destination_path: /eqiad.wmnet
+profile::etcd::replication::destination_path: /conftool
# only conf2002 is active
profile::etcd::replication::active: false
diff --git a/modules/etcdmirror/templates/initscripts/etcd-mirror.systemd.erb
b/modules/etcdmirror/templates/initscripts/etcd-mirror.systemd.erb
index 8f4fb1c..f5e62a5 100644
--- a/modules/etcdmirror/templates/initscripts/etcd-mirror.systemd.erb
+++ b/modules/etcdmirror/templates/initscripts/etcd-mirror.systemd.erb
@@ -9,7 +9,7 @@
Environment=ETCD_MIRROR_SRC_URL=<%= @src %>
Environment=ETCD_MIRROR_DST_URL=<%= @dst %>
SyslogIdentifier=<%= @title %>
-ExecStart=/usr/bin/etcd-mirror --src-prefix $ETCD_MIRROR_SRC_PREFIX
--dst-prefix $ETCD_MIRROR_DST_PREFIX $ETCD_MIRROR_SRC_URL $ETCD_MIRROR_DST_URL
+ExecStart=/usr/bin/etcd-mirror --strip --src-prefix $ETCD_MIRROR_SRC_PREFIX
--dst-prefix $ETCD_MIRROR_DST_PREFIX $ETCD_MIRROR_SRC_URL $ETCD_MIRROR_DST_URL
Restart=always
RestartPreventExitStatus=1 2
RestartSec=1s
--
To view, visit https://gerrit.wikimedia.org/r/349385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa08b0362d3a18b1a504b1e45c8cfa4de8b0b51f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[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
