Merge "Swarm: Incorrect reference to Flannel variables"

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

@@ -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