summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-12-13 14:37:41 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-13 14:37:41 +0000
commitb4088d7d26058f5df71c612a3075307263df1503 (patch)
tree04a0b50e153120a2c61e5cdb1527ff75b09d7a09
parent3e17a6ec5bfd4006efd969ec67b6b49bb36ac219 (diff)
parentde06099416c703af04861141b4a78645e7223ddb (diff)
Merge "Offline deployment fails on jumphost with docker installed"
-rwxr-xr-xdeploy/prepare.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index 06852a42..c2023223 100755
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -115,6 +115,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
@@ -159,6 +163,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()