Merge "Fix sourcing of proxy related environment variables"

This commit is contained in:
Zuul 2019-02-26 11:40:25 +00:00 committed by Gerrit Code Review
commit d4219e4c40

View File

@ -1,3 +1,7 @@
#!/bin/bash
test -f /home/ubuntu/.juju-proxy && source /home/ubuntu/.juju-proxy
if [ -f /etc/juju-proxy.conf ]; then
source /etc/juju-proxy.conf
elif [ -f /home/ubuntu/.juju-proxy ]; then
source /home/ubuntu/.juju-proxy
fi
exec /usr/share/glance-simplestreams-sync/glance-simplestreams-sync.py