openstack
/
magnum
Code Issues Proposed changes

Remove incorrect variable in etcd.conf 

As described in [1], the line [cluster] in /etc/etcd/etcd.conf
is incorrect. It is interpreted as an environment variable
without a value and ignored which is said by a systemd developer
on #systemd irc channel. The comments "# [member]" is not necessary.

[1] http://www.freedesktop.org/software/systemd/man/
systemd.exec.html#EnvironmentFile=

Change-Id: Iceb71540c04f93da16f9469f545c0b19a6cf58db
Closes-Bug: #1481269
This commit is contained in:
Hua Wang 2015-07-28 06:14:49 +08:00
parent 18664fd6e8
commit bf12bb14b4
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/templates/heat-kubernetes/fragments/configure-etcd.sh
View File

@ -6,13 +6,11 @@ myip=$(ip addr show eth0 |
awk '$1 == "inet" {print $2}' | cut -f1 -d/)
cat > /etc/etcd/etcd.conf <<EOF
# [member]
ETCD_NAME="$myip"
ETCD_DATA_DIR="/var/lib/etcd/default.etcd"
ETCD_LISTEN_CLIENT_URLS="http://0.0.0.0:4001"
ETCD_LISTEN_PEER_URLS="http://$myip:7001"
[cluster]
ETCD_ADVERTISE_CLIENT_URLS="http://$myip:4001"
ETCD_INITIAL_ADVERTISE_PEER_URLS="http://$myip:7001"
ETCD_DISCOVERY="$ETCD_DISCOVERY_URL"