summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-11-11 02:14:48 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-11 02:14:48 +0000
commit9dc55a9dc191d61e35d34042afd310626cb32538 (patch)
tree086a4f81a9c5308bf594f6b80706f76ae30bd3cd
parenta5bb59d6af992c36b1ce4683fa7c1dd2df2f3a46 (diff)
parent2d1bc2662ced6f3d0a15c672782616af8d2f5bf9 (diff)
Merge "Rename pip-ops to pip-openstack"
-rwxr-xr-xbuild.sh6
-rw-r--r--build/build.conf2
-rw-r--r--util/ks.cfg2
3 files changed, 5 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index b609104c..3de7dd95 100755
--- a/build.sh
+++ b/build.sh
@@ -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 $PIP_OPS_REPO $ANSIBLE_MODULE; do
+ $LOADERS $CIRROS $APP_PACKAGE $COMPASS_PKG $PIP_REPO $PIP_OPENSTACK_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/pip-ops $new/guestimg $new/app_packages $new/ansible
+ mkdir -p $new/compass $new/bootstrap $new/pip $new/pip-openstack $new/guestimg $new/app_packages $new/ansible
mkdir -p $new/repos/cobbler/{ubuntu,centos,redhat}/{iso,ppa}
rm -rf $new/.rr_moved
@@ -181,7 +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/
+ tar -zxvf $CACHE_DIR/`basename $PIP_OPENSTACK_REPO` -C $new/
find $new/compass -name ".git" | xargs rm -rf
}
diff --git a/build/build.conf b/build/build.conf
index 7b46ecf7..f9e40568 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -14,7 +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 PIP_OPENSTACK_REPO=${PIP_OPENSTACK_REPO:-$PACKAGE_URL/pip-openstack.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 62f2b110..41e6b74c 100644
--- a/util/ks.cfg
+++ b/util/ks.cfg
@@ -255,7 +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}/pip-openstack /var/www/pip-openstack
cp -rf ${SOURCE}/guestimg /var/www/guestimg
tar -zxvf ${SOURCE}/app_packages/packages.tar.gz -C /var/www