Merge pull request #1379 from gdmello/etcd_data_dir_fix

Custom `etcd_data_dir` saves etcd data to host, not container

roles/etcd/templates/etcd-rkt.service.j2

@@ -15,8 +15,8 @@ ExecStart=/usr/bin/rkt run \
 --mount=volume=etc-ssl-certs,target=/etc/ssl/certs \
 --volume=etcd-cert-dir,kind=host,source={{ etcd_cert_dir }},readOnly=true \
 --mount=volume=etcd-cert-dir,target={{ etcd_cert_dir }} \
---volume=var-lib-etcd,kind=host,source={{ etcd_data_dir }},readOnly=false \
---mount=volume=var-lib-etcd,target=/var/lib/etcd \
+--volume=etcd-data-dir,kind=host,source={{ etcd_data_dir }},readOnly=false \
+--mount=volume=etcd-data-dir,target={{ etcd_data_dir }} \
 --set-env-file=/etc/etcd.env \
 --stage1-from-dir=stage1-fly.aci \
 {{ etcd_image_repo }}:{{ etcd_image_tag }} \

roles/etcd/templates/etcd.j2

@@ -5,7 +5,7 @@
   --net=host \
   -v /etc/ssl/certs:/etc/ssl/certs:ro \
   -v {{ etcd_cert_dir }}:{{ etcd_cert_dir }}:ro \
-  -v {{ etcd_data_dir }}:/var/lib/etcd:rw \
+  -v {{ etcd_data_dir }}:{{ etcd_data_dir }}:rw \
   {% if etcd_memory_limit is defined %}
   --memory={{ etcd_memory_limit|regex_replace('Mi', 'M') }} \
   {% endif %}