diff options
author | liyuenan <liyuenan@huawei.com> | 2016-11-08 09:12:09 +0800 |
---|---|---|
committer | liyuenan <liyuenan@huawei.com> | 2016-11-08 15:09:17 +0800 |
commit | 92c05616a3612dca02ccbf88dcf4c73929f15dad (patch) | |
tree | 82f92c70f27f923356faba9249b959eed02c3ef6 /build.sh | |
parent | dbbb61368932e724f8aae720e1de53ae5c4eebf3 (diff) |
Split the Openstack's pip from pip
JIRA: COMPASS-491
Change-Id: Ief6df7da1b3729beb2ac56ff1cfd14a44c71ef21
Signed-off-by: liyuenan <liyuenan@huawei.com>
Diffstat (limited to 'build.sh')
-rwxr-xr-x | build.sh | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -82,7 +82,7 @@ function download_packages() $TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $TRUSTY_MITAKA_PPA $XENIAL_MITAKA_PPA $XENIAL_NEWTON_PPA \ $UBUNTU_ISO $UBUNTU_ISO1 $REDHAT7_ISO $REDHAT7_OSP9_PPA \ $CENTOS_ISO $CENTOS7_JUNO_PPA $CENTOS7_KILO_PPA $CENTOS7_LIBERTY_PPA $CENTOS7_MITAKA_PPA \ - $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG $PIP_REPO $ANSIBLE_MODULE; do + $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG $PIP_REPO $PIP_OPS_REPO $ANSIBLE_MODULE; do if [[ ! $i ]]; then continue @@ -105,7 +105,7 @@ function copy_file() new=$1 # main process - mkdir -p $new/compass $new/bootstrap $new/pip $new/guestimg $new/app_packages $new/ansible + mkdir -p $new/compass $new/bootstrap $new/pip $new/pip-ops $new/guestimg $new/app_packages $new/ansible mkdir -p $new/repos/cobbler/{ubuntu,centos,redhat}/{iso,ppa} rm -rf $new/.rr_moved @@ -181,6 +181,7 @@ function copy_file() cp $COMPASS_DIR/deploy/adapters $new/compass/compass-adapters -rf tar -zxvf $CACHE_DIR/`basename $PIP_REPO` -C $new/ + tar -zxvf $CACHE_DIR/`basename $PIP_OPS_REPO` -C $new/ find $new/compass -name ".git" | xargs rm -rf } |