diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh index 35cb266adc..faddf0052e 100644 --- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh +++ b/magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh @@ -16,6 +16,10 @@ if [ $TLS_DISABLED = 'True' ]; then ETCDCTL_OPTIONS="" fi +if [ -z "$NO_PROXY" ]; then + NO_PROXY=$SWARM_API_IP,$ETCD_SERVER_IP,$SWARM_NODE_IP +fi + cat > $CONF_FILE << EOF [Unit] Description=Swarm Agent diff --git a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh index e3b883e35a..fbb1a17a93 100644 --- a/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh +++ b/magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh @@ -2,6 +2,10 @@ CERT_DIR=/etc/docker +if [ -z "$NO_PROXY" ]; then + NO_PROXY=$SWARM_API_IP,$ETCD_SERVER_IP,$SWARM_NODE_IP +fi + cat > /etc/systemd/system/swarm-manager.service << END_SERVICE_TOP [Unit] Description=Swarm Manager