diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2016-11-28 13:08:26 +0800 |
|---|---|---|
| committer | Yifei Xue <xueyifei@huawei.com> | 2016-11-28 06:59:33 +0000 |
| commit | de06099416c703af04861141b4a78645e7223ddb (patch) | |
| tree | acdf2d9e325ab52c02f649cc20d3c60e64b580ad /deploy | |
| parent | 55a61f037dd6c089f734c4cd53af072562b7fc51 (diff) | |
Offline deployment fails on jumphost with docker installed
JIRA: COMPASS-508
Change-Id: I92fa3a40d010c74ca7d7d4f638413e7c9e571e36
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
(cherry picked from commit ff2621f0dbe1e49e4d7fad752ec6d9a2e9f1b444)
Diffstat (limited to 'deploy')
| -rwxr-xr-x | deploy/prepare.sh | 8 |
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() |