etcd: Use ETCD_NAME in etcd.conf

... instead of using the deprecated hiera CLI to load the source value
used to set the ETCD_NAME option.

Change-Id: Iabdbd79cd66a2ebded8ba3bf5e1911d9e5370e40

deployment/etcd/etcd-container-puppet.yaml

@@ -217,7 +217,6 @@ outputs:
                 # etcdctl doesn't generate reliable error status, so use presence of the
                 # node's own name to determine whether this node is capable of managing
                 # etcd membership.
-                ETCD_NAME=$(hiera -c /etc/puppet/hiera.yaml fqdn_${ETCD_NETWORK})
                 if ! grep -q $ETCD_NAME /tmp/etcd-members; then
                   echo "This is a new node that is unable to manage etcd membership"
                   exit 0
@@ -275,7 +274,6 @@ outputs:
                       - /etc/pki/tls/private/etcd.key:/var/lib/kolla/config_files/src-tls/etc/pki/tls/private/etcd.key:ro
             environment:
               KOLLA_CONFIG_STRATEGY: COPY_ALWAYS
-              ETCD_NETWORK: {get_param: [ServiceNetMap, EtcdNetwork]}
       deploy_steps_tasks:
         list_concat:
           - - name: Manage etcd cluster membership