From 7c0be2d3840bcfbaa5b3e13898110cc945896833 Mon Sep 17 00:00:00 2001 From: Mathieu Velten Date: Mon, 5 Sep 2016 15:23:00 +0200 Subject: [PATCH] Add support for overlay networks in Swarm. Built-in in docker >= 1.9, it justs need a K-V store. This patch reuses the existing etcd supporting Swarm. Change-Id: Iae2e5aa1d8836d344f16ec911c766c426b1b558a --- .../templates/fragments/network-service.sh | 7 +++++++ .../add-overlay-networks-to-swarm-4467986d7853fcd8.yaml | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/add-overlay-networks-to-swarm-4467986d7853fcd8.yaml diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/network-service.sh b/magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/network-service.sh index c6559adb75..934a44be61 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/network-service.sh +++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/network-service.sh @@ -4,6 +4,13 @@ echo "Configuring ${NETWORK_DRIVER} network service ..." +if [ "$NETWORK_DRIVER" == "docker" ]; then + DOCKER_NETWORK_OPTIONS="--cluster-store etcd://$ETCD_SERVER_IP:2379\ + --cluster-advertise $SWARM_NODE_IP:9379" + sed -i "/^DOCKER_NETWORK_OPTIONS=/ s#=.*#='$DOCKER_NETWORK_OPTIONS'#" \ + /etc/sysconfig/docker-network +fi + if [ "$NETWORK_DRIVER" != "flannel" ]; then exit 0 fi diff --git a/releasenotes/notes/add-overlay-networks-to-swarm-4467986d7853fcd8.yaml b/releasenotes/notes/add-overlay-networks-to-swarm-4467986d7853fcd8.yaml new file mode 100644 index 0000000000..f14f85c1c8 --- /dev/null +++ b/releasenotes/notes/add-overlay-networks-to-swarm-4467986d7853fcd8.yaml @@ -0,0 +1,9 @@ +--- +features: + - Add configuration for overlay networks for the docker + network driver in swarm. To use this feature, users need + to create a swarm cluster with network_driver set to 'docker'. + After the cluster is created, users can create an overlay network + (docker network create -d overlay mynetwork) and use it when + launching a new container (docker run --net=mynetwork ...). +