Merge pull request #4313 from carmstrong/fix-ec2-etcd2

fix(contrib): fix etcd2 data directory on AWS

Author: carmstrong

contrib/aws/gen-json.py

@@ -105,8 +105,7 @@
 dump = yaml.dump(data, default_flow_style=False)
 
 # configure etcd to use its EBS volume
-dump = dump.replace('-data-dir /var/lib/etcd2', '-data-dir /media/etcd')
-dump = dump.replace('--volume=/var/lib/etcd2', '--volume=/media/etcd')
+dump = dump.replace('ETCD_HOST_DATA_DIR=/var/lib/etcd2', 'ETCD_HOST_DATA_DIR=/media/etcd')
 
 template = json.load(open(os.path.join(CURR_DIR, 'deis.template.json'), 'r'))
 

contrib/coreos/user-data.example

@@ -28,13 +28,13 @@ coreos:
       Environment="ETCD_IMAGE=quay.io/coreos/etcd:v2.1.1"
       Environment="ETCD_ELECTION_TIMEOUT=2000"
       Environment="ETCD_HEARTBEAT_INTERVAL=400"
-      Environment="ETCD_DATA_DIR=/var/lib/etcd2"
+      Environment="ETCD_HOST_DATA_DIR=/var/lib/etcd2"
       Environment="ETCD_NAME=%m"
       Environment="DOCKER_HOST=unix:///var/run/early-docker.sock"
       ExecStartPre=/bin/sh -c "docker history $ETCD_IMAGE >/dev/null 2>&1 || docker pull $ETCD_IMAGE"
       ExecStartPre=/bin/sh -c "docker inspect $ETCD_NAME >/dev/null 2>&1 && docker rm -f $ETCD_NAME || true"
       ExecStart=/usr/bin/docker run --net=host --rm \
-        --volume=${ETCD_DATA_DIR}:/var/lib/etcd2 \
+        --volume=${ETCD_HOST_DATA_DIR}:/var/lib/etcd2 \
         --volume=/usr/share/ca-certificates:/etc/ssl/certs:ro \
         -p 4001:4001 -p 2380:2380 -p 2379:2379 -p 7001:7001 \
         --name ${ETCD_NAME} \