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 | |
| parent | dbbb61368932e724f8aae720e1de53ae5c4eebf3 (diff) | |
Split the Openstack's pip from pip
JIRA: COMPASS-491
Change-Id: Ief6df7da1b3729beb2ac56ff1cfd14a44c71ef21
Signed-off-by: liyuenan <liyuenan@huawei.com>
| -rwxr-xr-x | build.sh | 5 | ||||
| -rw-r--r-- | build/build.conf | 1 | ||||
| -rw-r--r-- | util/ks.cfg | 1 |
3 files changed, 5 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 } diff --git a/build/build.conf b/build/build.conf index c837d74e..7b46ecf7 100644 --- a/build/build.conf +++ b/build/build.conf @@ -14,6 +14,7 @@ export COMPASS_INSTALL=${COMPASS_INSTALL:-http://github.com/baigk/compass-instal # Compass core packages export COMPASS_PKG=${COMPASS_PKG:-$PACKAGE_URL/centos7-compass-core.tar.gz} export PIP_REPO=${PIP_REPO:-$PACKAGE_URL/pip.tar.gz} +export PIP_OPS_REPO=${PIP_OPS_REPO:-$PACKAGE_URL/pip-ops.tar.gz} export ANSIBLE_MODULE=${ANSIBLE_MODULE:-https://github.com/openstack-ansible/openstack-ansible-modules.git} # OS ISO for provisioning diff --git a/util/ks.cfg b/util/ks.cfg index 76ce0ff6..62f2b110 100644 --- a/util/ks.cfg +++ b/util/ks.cfg @@ -255,6 +255,7 @@ cp -rf ${SOURCE}/ansible/* /opt cp -rf ${SOURCE}/repos/* /opt cp -rf ${SOURCE}/loaders.tar.gz /opt cp -rf ${SOURCE}/pip /var/www/pip +cp -rf ${SOURCE}/pip-ops /var/www/pip-ops cp -rf ${SOURCE}/guestimg /var/www/guestimg tar -zxvf ${SOURCE}/app_packages/packages.tar.gz -C /var/www |