Remote deprecated create-bridge command

This commit is contained in:
Bryan Boreham committed 2017-05-09 15:10:42 +00:00
1 parent c85fff8f23
commit 8a5fef98ab
1 file changed
+1 -16
+1 -16
View File
@@ -136,7 +136,7 @@ exec_options() {
;;
# All the other commands that may create the bridge and need machine id files.
# We don't mount '/' to avoid recursive mounts of '/var'
create-bridge|attach|expose|hide)
attach|expose|hide)
echo -v /etc:/host/etc -v /var/lib/dbus:/host/var/lib/dbus -e HOST_ROOT=/host
;;
esac
@@ -1523,21 +1523,6 @@ case "$COMMAND" in
ask_version $CONTAINER_NAME $IMAGE || true
ask_version $PROXY_CONTAINER_NAME $EXEC_IMAGE --entrypoint=/home/weave/weaveproxy || true
;;
# intentionally undocumented since it assumes knowledge of weave
# internals
create-bridge)
if [ "$1" != "--force" ] ; then
cat 1>&2 <<EOF
WARNING: 'weave create-bridge' is deprecated. Instead use 'weave attach-bridge'
to link the docker and weave bridges after both docker and weave have been
started. Note that, unlike 'weave create-bridge', 'weave attach-bridge' is
compatible with fast data path.
EOF
else
shift 1
fi
create_bridge "$@"
;;
attach-bridge)
if detect_bridge_type ; then
attach_bridge ${1:-$DOCKER_BRIDGE}