Use right no proxy settings for swarm master and agent

Change-Id: I6a920a189264bf4c306be44399caa25537d4a0ce
Closes-Bug: 1660562
This commit is contained in:
Kevin Lefevre 2017-01-31 10:21:20 +01:00
parent 25aa5b06ff
commit a24de0a536
2 changed files with 8 additions and 0 deletions

View File

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

View File

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