Make Docker proxy configuration consistent across template
Closes-Bug: #1647815 Related-Bug: #1632698 Change-Id: Ic5e5cadd3d912f01072eff427a1095309c4f6e9b
This commit is contained in:
parent
f04c3ff657
commit
8d7bc9c99e
|
@ -2,19 +2,25 @@
|
|||
|
||||
. /etc/sysconfig/heat-params
|
||||
|
||||
DOCKER_PROXY_CONF=/etc/systemd/system/docker.service.d/proxy.conf
|
||||
DOCKER_HTTP_PROXY_CONF=/etc/systemd/system/docker.service.d/http_proxy.conf
|
||||
|
||||
DOCKER_HTTPS_PROXY_CONF=/etc/systemd/system/docker.service.d/https_proxy.conf
|
||||
|
||||
DOCKER_NO_PROXY_CONF=/etc/systemd/system/docker.service.d/no_proxy.conf
|
||||
|
||||
DOCKER_RESTART=0
|
||||
|
||||
BASH_RC=/etc/bashrc
|
||||
|
||||
mkdir -p /etc/systemd/system/docker.service.d
|
||||
|
||||
if [ -n "$HTTP_PROXY" ]; then
|
||||
cat <<EOF | sed "s/^ *//" > $DOCKER_PROXY_CONF
|
||||
cat <<EOF | sed "s/^ *//" > $DOCKER_HTTP_PROXY_CONF
|
||||
[Service]
|
||||
Environment=HTTP_PROXY=$HTTP_PROXY
|
||||
EOF
|
||||
|
||||
systemctl daemon-reload
|
||||
systemctl --no-block restart docker.service
|
||||
DOCKER_RESTART=1
|
||||
|
||||
if [ -f "$BASH_RC" ]; then
|
||||
echo "declare -x http_proxy=$HTTP_PROXY" >> $BASH_RC
|
||||
|
@ -24,6 +30,13 @@ EOF
|
|||
fi
|
||||
|
||||
if [ -n "$HTTPS_PROXY" ]; then
|
||||
cat <<EOF | sed "s/^ *//" > $DOCKER_HTTPS_PROXY_CONF
|
||||
[Service]
|
||||
Environment=HTTPS_PROXY=$HTTPS_PROXY
|
||||
EOF
|
||||
|
||||
DOCKER_RESTART=1
|
||||
|
||||
if [ -f "$BASH_RC" ]; then
|
||||
echo "declare -x https_proxy=$HTTPS_PROXY" >> $BASH_RC
|
||||
else
|
||||
|
@ -32,9 +45,21 @@ if [ -n "$HTTPS_PROXY" ]; then
|
|||
fi
|
||||
|
||||
if [ -n "$NO_PROXY" ]; then
|
||||
cat <<EOF | sed "s/^ *//" > $DOCKER_NO_PROXY_CONF
|
||||
[Service]
|
||||
Environment=NO_PROXY=$NO_PROXY
|
||||
EOF
|
||||
|
||||
DOCKER_RESTART=1
|
||||
|
||||
if [ -f "$BASH_RC" ]; then
|
||||
echo "declare -x no_proxy=$NO_PROXY" >> $BASH_RC
|
||||
else
|
||||
echo "File $BASH_RC does not exist, not setting no_proxy"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$DOCKER_RESTART" -eq 1 ]; then
|
||||
systemctl daemon-reload
|
||||
systemctl --no-block restart docker.service
|
||||
fi
|
||||
|
|
|
@ -12,6 +12,8 @@ DOCKER_RESTART=0
|
|||
|
||||
BASH_RC=/etc/bashrc
|
||||
|
||||
mkdir -p /etc/systemd/system/docker.service.d
|
||||
|
||||
if [ -n "$HTTP_PROXY" ]; then
|
||||
cat <<EOF | sed "s/^ *//" > $DOCKER_HTTP_PROXY_CONF
|
||||
[Service]
|
||||
|
@ -35,7 +37,7 @@ EOF
|
|||
|
||||
DOCKER_RESTART=1
|
||||
|
||||
if [ -f $BASH_RC ]; then
|
||||
if [ -f "$BASH_RC" ]; then
|
||||
echo "declare -x https_proxy=$HTTPS_PROXY" >> $BASH_RC
|
||||
else
|
||||
echo "File $BASH_RC does not exist, not setting https_proxy"
|
||||
|
@ -50,6 +52,11 @@ EOF
|
|||
|
||||
DOCKER_RESTART=1
|
||||
|
||||
if [ -f "$BASH_RC" ]; then
|
||||
echo "declare -x no_proxy=$NO_PROXY" >> $BASH_RC
|
||||
else
|
||||
echo "File $BASH_RC does not exist, not setting no_proxy"
|
||||
fi
|
||||
else
|
||||
cat <<EOF | sed "s/^ *//" > $DOCKER_NO_PROXY_CONF
|
||||
[Service]
|
||||
|
@ -59,11 +66,7 @@ EOF
|
|||
DOCKER_RESTART=1
|
||||
|
||||
if [ -f "$BASH_RC" ]; then
|
||||
if [ -n "$NO_PROXY" ]; then
|
||||
echo "declare -x no_proxy=$NO_PROXY" >> $BASH_RC
|
||||
else
|
||||
echo "declare -x no_proxy=$SWARM_API_IP,$ETCD_SERVER_IP,$SWARM_NODE_IP" >> $BASH_RC
|
||||
fi
|
||||
echo "declare -x no_proxy=$SWARM_API_IP,$ETCD_SERVER_IP,$SWARM_NODE_IP" >> $BASH_RC
|
||||
else
|
||||
echo "File $BASH_RC does not exist, not setting no_proxy"
|
||||
fi
|
||||
|
|
|
@ -22,25 +22,52 @@ write_files:
|
|||
|
||||
. /etc/sysconfig/heat-params
|
||||
|
||||
DOCKER_PROXY_CONF=/etc/systemd/system/docker.service.d/http-proxy.conf
|
||||
DOCKER_HTTP_PROXY_CONF=/etc/systemd/system/docker.service.d/http_proxy.conf
|
||||
|
||||
DOCKER_HTTPS_PROXY_CONF=/etc/systemd/system/docker.service.d/https_proxy.conf
|
||||
|
||||
DOCKER_NO_PROXY_CONF=/etc/systemd/system/docker.service.d/no_proxy.conf
|
||||
|
||||
DOCKER_RESTART=0
|
||||
|
||||
ENVIRONMENT=/etc/environment
|
||||
|
||||
mkdir -p /etc/systemd/system/docker.service.d
|
||||
|
||||
if [ -n "$HTTP_PROXY" ]; then
|
||||
cat <<EOF | sed "s/^ *//" > $DOCKER_PROXY_CONF
|
||||
HTTP_PROXY=$HTTP_PROXY
|
||||
cat <<EOF | sed "s/^ *//" > $DOCKER_HTTP_PROXY_CONF
|
||||
[Service]
|
||||
Environment=HTTP_PROXY=$HTTP_PROXY
|
||||
EOF
|
||||
echo "http_proxy=$HTTP_PROXY" >> $ENVIRONMENT
|
||||
|
||||
systemctl daemon-reload
|
||||
systemctl --no-block restart docker.service
|
||||
DOCKER_RESTART=1
|
||||
|
||||
echo "http_proxy=$HTTP_PROXY" >> $ENVIRONMENT
|
||||
fi
|
||||
|
||||
if [ -n "$HTTPS_PROXY" ]; then
|
||||
cat <<EOF | sed "s/^ *//" > $DOCKER_HTTPS_PROXY_CONF
|
||||
[Service]
|
||||
Environment=HTTPS_PROXY=$HTTPS_PROXY
|
||||
EOF
|
||||
|
||||
DOCKER_RESTART=1
|
||||
|
||||
echo "https_proxy=$HTTPS_PROXY" >> $ENVIRONMENT
|
||||
fi
|
||||
|
||||
if [ -n "$NO_PROXY" ]; then
|
||||
echo "no_proxy=$NO_PROXY" >> ENVIRONMENT
|
||||
cat <<EOF | sed "s/^ *//" > $DOCKER_NO_PROXY_CONF
|
||||
[Service]
|
||||
Environment=NO_PROXY=$NO_PROXY
|
||||
EOF
|
||||
|
||||
DOCKER_RESTART=1
|
||||
|
||||
echo "no_proxy=$NO_PROXY" >> ENVIRONMENT
|
||||
fi
|
||||
|
||||
if [ "$DOCKER_RESTART" -eq 1 ]; then
|
||||
systemctl daemon-reload
|
||||
systemctl --no-block restart docker.service
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue