Merge "[suse] configure flanneld on master node"
This commit is contained in:
commit
0ac6b2a520
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
. /etc/sysconfig/heat-params
|
. /etc/sysconfig/heat-params
|
||||||
|
|
||||||
if [ "$NETWORK_DRIVER" == "flannel" ]; then
|
if [ "$NETWORK_DRIVER" != "flannel" ]; then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -52,9 +52,6 @@ cat >> $FLANNEL_JSON <<EOF
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
#echo "creating flanneld config in etcd"
|
|
||||||
#etcdctl --endpoints $FLANNEL_ETCD --no-sync set ${FLANNEL_ETCD_KEY}/config < ${FLANNEL_JSON}
|
|
||||||
|
|
||||||
# wait for etcd to become active (we will need it to push the flanneld config)
|
# wait for etcd to become active (we will need it to push the flanneld config)
|
||||||
while ! curl -sf -o /dev/null $FLANNEL_ETCD/v2/keys/; do
|
while ! curl -sf -o /dev/null $FLANNEL_ETCD/v2/keys/; do
|
||||||
echo "waiting for etcd"
|
echo "waiting for etcd"
|
||||||
|
|
Loading…
Reference in New Issue