chore(*): bump etcd to v2.1.1

Author: carmstrong

contrib/coreos/user-data.example

@@ -24,7 +24,7 @@ coreos:
       RestartSec=10s
       LimitNOFILE=40000
       EnvironmentFile=/etc/environment
-      Environment="ETCD_IMAGE=quay.io/coreos/etcd:v2.0.13"
+      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"

tests/fixtures/test-etcd/Dockerfile

@@ -3,11 +3,13 @@ FROM alpine:3.1
 # install common packages
 RUN apk add --update-cache curl tar && rm -rf /var/cache/apk/*
 
-ENV ETCD_VERSION v0.4.9
+# ETCD_VERSION is actually used by the etcd daemon, and causes an issue if we
+# format it for our use here. So, we call this something else.
+ENV INSTALL_ETCD_VERSION v2.1.1
 
 # install etcd and etcdctl
-RUN curl -sSL https://github.com/coreos/etcd/releases/download/$ETCD_VERSION/etcd-$ETCD_VERSION-linux-amd64.tar.gz \
+RUN curl -sSL https://github.com/coreos/etcd/releases/download/$INSTALL_ETCD_VERSION/etcd-$INSTALL_ETCD_VERSION-linux-amd64.tar.gz \
   | tar -vxz -C /usr/local/bin --strip=1
 
-EXPOSE 4001 7001
+EXPOSE 4001 7001 2379 2380
 CMD ["/usr/local/bin/etcd"]