openstack/magnum
Code Issues Proposed changes

Merge "Use right no proxy settings for swarm master and agent"

Browse Source
This commit is contained in:
Jenkins
2017-02-07 01:21:42 +00:00
committed by Gerrit Code Review
parent 0d58cf4dbe a24de0a536
commit dc7f5aba3f
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/drivers/common/templates/swarm/fragments/write-swarm-agent-service.sh
View File

@@ -16,6 +16,10 @@ if [ $TLS_DISABLED = 'True' ]; then
ETCDCTL_OPTIONS="" ETCDCTL_OPTIONS=""
fi fi
if [ -z "$NO_PROXY" ]; then
NO_PROXY=$SWARM_API_IP,$ETCD_SERVER_IP,$SWARM_NODE_IP
fi
cat > $CONF_FILE << EOF cat > $CONF_FILE << EOF
[Unit] [Unit]
Description=Swarm Agent Description=Swarm Agent

4
magnum/drivers/common/templates/swarm/fragments/write-swarm-master-service.sh
View File

@@ -2,6 +2,10 @@
CERT_DIR=/etc/docker 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 cat > /etc/systemd/system/swarm-manager.service << END_SERVICE_TOP
[Unit] [Unit]
Description=Swarm Manager Description=Swarm Manager