openstack
/
magnum
Code Issues Proposed changes

Swarm: Incorrect reference to Flannel variables 

Swarm network-config-service makes reference to
wrong variables:
- FLANNEL_ETCD instead of FLANNEL_ETCD_ENDPOINTS
- FLANNEL_ETCD_KEY instead of FLANNEL_ETCD_PREFIX

Change-Id: Ie9f1913177f4a5fd803bcf8de1de66384395ecdd
Closes-Bug: #1679301
This commit is contained in:
Javier Castillo Alcíbar 2017-09-27 13:10:42 +02:00
parent 6fb2a77419
commit 010a2673d4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/drivers/common/templates/swarm/fragments/network-config-service.sh
View File

@ -47,14 +47,14 @@ if ! [ -f "$FLANNEL_JSON" ]; then
exit 1
fi
if ! [ "$FLANNEL_ETCD" ] && [ "$FLANNEL_ETCD_KEY" ]; then
if ! [ "$FLANNEL_ETCD_ENDPOINTS" ] && [ "$FLANNEL_ETCD_PREFIX" ]; then
echo "ERROR: missing required configuration" >&2
exit 1
fi
echo "creating flanneld config in etcd"
while ! curl -sf -L $ETCD_CURL_OPTIONS \
$FLANNEL_ETCD/v2/keys${FLANNEL_ETCD_KEY}/config \
$FLANNEL_ETCD/v2/keys${FLANNEL_ETCD_PREFIX}/config \
-X PUT --data-urlencode value@${FLANNEL_JSON}; do
echo "waiting for etcd"
sleep 1