Giuseppe Lavagetto has submitted this change and it was merged.

Change subject: confd1001: join the etcd cluster
......................................................................


confd1001: join the etcd cluster

Please note that we will need to change the DNS records before merging
this.

Change-Id: I5c523833b0f0e15bce46519d1ea4d1f1734aafe7
---
A hieradata/hosts/conf1001.yaml
M manifests/site.pp
2 files changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/hosts/conf1001.yaml b/hieradata/hosts/conf1001.yaml
new file mode 100644
index 0000000..e814f71
--- /dev/null
+++ b/hieradata/hosts/conf1001.yaml
@@ -0,0 +1,3 @@
+etcd::cluster_state: "existing"
+etcd::peers_list: 
"conf1001=http://conf1001.eqiad.wmnet:2380,etcd1001=http://etcd1001.eqiad.wmnet:2380,etcd1002=http://etcd1002.eqiad.wmnet:2380,etcd1003=http://etcd1003.eqiad.wmnet:2380";
+etcd::srv_dns: false
diff --git a/manifests/site.pp b/manifests/site.pp
index 1c9b696..d3deeb5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -353,10 +353,13 @@
 
 # conf100x are zookeeper and etcd discovery service nodes
 node /^conf100[123]\.eqiad\.wmnet$/ {
+    if $hostname == 'conf1001' {
+        role etcd
+    }
     include base::firewall
     include standard
 
-    role zookeeper::server
+    include role::zookeeper::server
 }
 
 # Debian package building host in production

-- 
To view, visit https://gerrit.wikimedia.org/r/221099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5c523833b0f0e15bce46519d1ea4d1f1734aafe7
Gerrit-PatchSet: 3
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

Reply via email to