Merge pull request #997 from martinssipenko/env

Load member .env file that is generated by etcdadm.

Author: mumoshu

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

@@ -269,6 +269,7 @@ coreos:
 
             [Service]
             EnvironmentFile=-/etc/etcd-environment
+            EnvironmentFile=-/var/run/coreos/etcdadm/etcd-member.env
 
             PermissionsStartOnly=true
             ExecStartPre=/usr/bin/systemctl is-active cfn-etcd-environment.service

core/controlplane/config/templates/stack-template.json

@@ -750,6 +750,9 @@
                   "ETCDADM_STATE_FILES_DIR='",
                     "/var/run/coreos/etcdadm",
                   "'\n",
+                  "ETCDADM_MEMBER_ENV_FILE='",
+                    "/var/run/coreos/etcdadm/etcd-member.env",
+                  "'\n",
                   "ETCDADM_MEMBER_COUNT='",
                     "{{$.Etcd.Count}}",
                   "'\n",

etcdadm/etcdadm

@@ -525,11 +525,7 @@ member_restore_from_local_snapshot() {
 }
 
 member_env_file() {
-  local name
-  local env_file
-  name=$(member_name)
-  env_file=$(config_state_dir)/${name}.env
-  echo "${env_file}"
+  echo "${ETCDADM_MEMBER_ENV_FILE:-$(config_state_dir)/$(member_name).env}"
 }
 
 member_set_initial_cluster_state() {