aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2016-10-28 16:07:31 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-28 16:07:31 +0000
commit7a120938c5f7428954f9a52d6e885df1c04392ec (patch)
treee56aa8fdf06c54fb0d03917f72e1a45f76962023
parentf5459c2de4fa37ffe0858ff3f498a299823fffb8 (diff)
parent79ee2c223cf778f74fc6984464cb68a5c0d4ce6f (diff)
Merge "support rhel7.2 with osp9 iso build"
-rwxr-xr-xbuild.sh12
-rw-r--r--build/build.conf2
2 files changed, 12 insertions, 2 deletions
diff --git a/build.sh b/build.sh
index a8014a89..847f9825 100755
--- a/build.sh
+++ b/build.sh
@@ -80,7 +80,7 @@ function download_packages()
{
for i in $CENTOS_BASE $COMPASS_CORE $COMPASS_WEB $COMPASS_INSTALL \
$TRUSTY_JUNO_PPA $TRUSTY_LIBERTY_PPA $TRUSTY_MITAKA_PPA $XENIAL_MITAKA_PPA $XENIAL_NEWTON_PPA \
- $UBUNTU_ISO $UBUNTU_ISO1 \
+ $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
@@ -106,7 +106,7 @@ function copy_file()
# main process
mkdir -p $new/compass $new/bootstrap $new/pip $new/guestimg $new/app_packages $new/ansible
- mkdir -p $new/repos/cobbler/{ubuntu,centos}/{iso,ppa}
+ mkdir -p $new/repos/cobbler/{ubuntu,centos,redhat}/{iso,ppa}
rm -rf $new/.rr_moved
@@ -158,6 +158,14 @@ function copy_file()
cp $CACHE_DIR/`basename $CENTOS7_MITAKA_PPA` $new/repos/cobbler/centos/ppa/ -rf
fi
+ if [[ $REDHAT7_ISO ]]; then
+ cp $CACHE_DIR/`basename $REDHAT7_ISO` $new/repos/cobbler/redhat/iso/ -rf
+ fi
+
+ if [[ $REDHAT7_OSP9_PPA ]]; then
+ cp $CACHE_DIR/`basename $REDHAT7_OSP9_PPA` $new/repos/cobbler/redhat/ppa/ -rf
+ fi
+
cp $CACHE_DIR/`basename $LOADERS` $new/ -rf || exit 1
cp $CACHE_DIR/`basename $APP_PACKAGE` $new/app_packages/ -rf || exit 1
cp $CACHE_DIR/`basename $ANSIBLE_MODULE | sed 's/.git//g'` $new/ansible/ -rf || exit 1
diff --git a/build/build.conf b/build/build.conf
index 7d8dcee3..c837d74e 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -20,6 +20,7 @@ export ANSIBLE_MODULE=${ANSIBLE_MODULE:-https://github.com/openstack-ansible/ope
export CENTOS_ISO=${CENTOS_ISO:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1511.iso}
export UBUNTU_ISO=${UBUNTU_ISO:-$PACKAGE_URL/ubuntu-16.04-server-amd64.iso} # ubuntu 16.04
export UBUNTU_ISO1=${UBUNTU_ISO1:-$PACKAGE_URL/ubuntu-14.04.3-server-amd64.iso} # ubuntu 14.04
+# export REDHAT7_ISO=${REDHAT7_ISO:-$PACKAGE_URL/rhel-server-7.2-x86_64-dvd.iso} # rhel 7.2
# OpenStack Packages for deployment
#export TRUSTY_JUNO_PPA=${TRUSTY_JUNO_PPA:-$PACKAGE_URL/trusty-juno-ppa.tar.gz}
@@ -31,6 +32,7 @@ export XENIAL_NEWTON_PPA=${XENIAL_NEWTON_PPA:-$PACKAGE_URL/xenial-newton-ppa.tar
#export CENTOS7_KILO_PPA=${CENTOS7_KILO_PPA:-$PACKAGE_URL/centos7-kilo-ppa.tar.gz}
export CENTOS7_LIBERTY_PPA=${CENTOS7_LIBERTY_PPA:-$PACKAGE_URL/centos7-liberty-ppa.tar.gz}
export CENTOS7_MITAKA_PPA=${CENTOS7_MITAKA_PPA:-$PACKAGE_URL/centos7-mitaka-ppa.tar.gz}
+# export REDHAT7_OSP9_PPA=${REDHAT7_OSP9_PPA:-$PACKAGE_URL/redhat7-osp9-ppa.tar.gz}
# SDN Packages for integration
export APP_PACKAGE=${APP_PACKAGE:-$PACKAGE_URL/packages.tar.gz}