openstack/devstack
Code Issues Proposed changes

Merge "XenAPI: Always update proxy settings"

Browse Source
This commit is contained in:
Jenkins 2014-10-31 10:30:42 +00:00 committed by Gerrit Code Review
commit 918f68b8bd
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/xen/prepare_guest_template.sh
View File

@ -118,3 +118,10 @@ deb-src http://security.ubuntu.com/ubuntu ${UBUNTU_INST_RELEASE}-security univer
deb http://security.ubuntu.com/ubuntu ${UBUNTU_INST_RELEASE}-security multiverse
deb-src http://security.ubuntu.com/ubuntu ${UBUNTU_INST_RELEASE}-security multiverse
EOF
rm -f $STAGING_DIR/etc/apt/apt.conf
if [ -n "$UBUNTU_INST_HTTP_PROXY" ]; then
cat > $STAGING_DIR/etc/apt/apt.conf << EOF
Acquire::http::Proxy "$UBUNTU_INST_HTTP_PROXY";
EOF
fi