aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-11-28 06:59:11 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-28 06:59:11 +0000
commitb212b7ac454fea642d7637e7489ff69665e54289 (patch)
treeda5843314cc422f9124e4ad3fe603a418509ee1d /deploy
parentf95408e87add65c17e57216ad7614155b0dd5402 (diff)
parentff2621f0dbe1e49e4d7fad752ec6d9a2e9f1b444 (diff)
Merge "Offline deployment fails on jumphost with docker installed" into stable/colorado
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/prepare.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index 97771b87..ea1534ff 100755
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -114,6 +114,10 @@ function _pre_env_setup()
cd $WORK_DIR/prepare/jh_env_package
tar -zxvf trusty-jh-ppa.tar.gz
+ if [[ ! -z /etc/apt/sources.list.d ]]; then
+ mv /etc/apt/sources.list.d /etc/apt/sources.list.d.bak
+ fi
+
if [[ -f /etc/apt/apt.conf ]]; then
mv /etc/apt/apt.conf /etc/apt/apt.conf.bak
fi
@@ -158,6 +162,10 @@ EOF
if [[ -f /etc/apt/apt.conf.bak ]]; then
mv /etc/apt/apt.conf.bak /etc/apt/apt.conf
fi
+
+ if [[ ! -z /etc/apt/sources.list.d.bak ]]; then
+ mv /etc/apt/sources.list.d.bak /etc/apt/sources.list.d
+ fi
}
function _pre_pip_setup()