From 8be8a04fe535f186806bd179b293ccf7836ff72d Mon Sep 17 00:00:00 2001
From: James Oliver <joliver@rancher.com>
Date: Wed, 15 Jun 2016 14:22:35 -0700
Subject: [PATCH] Failover fixes (#180)

---
 templates/etcd-ha/2/docker-compose.yml  | 2 ++
 templates/etcd-ha/2/rancher-compose.yml | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/etcd-ha/2/docker-compose.yml b/templates/etcd-ha/2/docker-compose.yml
index c973d53..c21da48 100644
--- a/templates/etcd-ha/2/docker-compose.yml
+++ b/templates/etcd-ha/2/docker-compose.yml
@@ -3,6 +3,8 @@ etcd:
   labels:
     io.rancher.scheduler.affinity:container_label_ne: io.rancher.stack_service.name=$${stack_name}/$${service_name}
     io.rancher.sidekicks: data
+    io.rancher.service.allocate.skip.serialize: 'true'
+    io.rancher.container.start_once: 'true'
   environment:
     ETCD_DATA_DIR: /data
     ETCDCTL_ENDPOINT: http://etcd:2379
diff --git a/templates/etcd-ha/2/rancher-compose.yml b/templates/etcd-ha/2/rancher-compose.yml
index 16b8e05..3f2916c 100644
--- a/templates/etcd-ha/2/rancher-compose.yml
+++ b/templates/etcd-ha/2/rancher-compose.yml
@@ -12,7 +12,6 @@
       default: 3
       type: "int"
 etcd:
-  retain_ip: true
   scale: ${REPLICAS}
   health_check:
     port: 2379