Merge pull request #1281 from mumoshu/fix-strange-systemd-behavior-breaking-etcd

Fix etcd breakage due to strange systemd behavior

Author: mumoshu

core/controlplane/config/templates/cloud-config-etcd

@@ -92,7 +92,6 @@ coreos:
         Restart=on-failure
         RemainAfterExit=true
         ExecStartPre=/opt/bin/cfn-etcd-environment
-        ExecStartPre=/usr/bin/mv -f /var/run/coreos/etcd-environment /etc/etcd-environment
         ExecStart=/bin/true
         TimeoutStartSec=120
 
@@ -755,6 +754,9 @@ write_files:
 
       run append-etcd-server-env
 
+      echo 'moving /var/run/coreos/etcd-environment to /etc/etcd-environment'
+      /usr/bin/mv -f /var/run/coreos/etcd-environment /etc/etcd-environment
+
       /usr/bin/sed -i "s/^ETCDCTL_ENDPOINT.*$/ETCDCTL_ENDPOINT=https:\/\/$(cat /var/run/coreos/advertised-hostname):2379/" /etc/environment
 
   - path: /opt/bin/etcdadm