Modify build.conf for Brahmaputra release

reorganize build.config for Brahmaputra.
reduce the size of ISO release.

Change-Id: Ibaa11958782b5705e3a371c8b55942cd6a6ba5d2
Signed-off-by: Justin-chi <chigang@huawei.com>

diff --git a/build/build.conf b/build/build.conf
index 0406d9f..d533331 100644 (file)
--- a/build/build.conf
+++ b/build/build.conf
@@ -1,25 +1,39 @@
 TIMEOUT=10
+
+# PACKAGE_URL will be reset in Jenkins for different branch
 export PACKAGE_URL=${PACKAGE_URL:-http://205.177.226.237:9999}
 
-#begin: package download
+# Jumphost OS version
 export CENTOS_BASE=${CENTOS_BASE:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1511.iso}
+
+# Compass git repository
 export COMPASS_CORE=${COMPASS_CORE:-https://github.com/openstack/compass-core.git}
 export COMPASS_WEB=${COMPASS_WEB:-http://github.com/baigk/compass-web.git}
 export COMPASS_INSTALL=${COMPASS_INSTALL:-http://github.com/baigk/compass-install.git}
+
+# 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 ANSIBLE_MODULE=${ANSIBLE_MODULE:-https://github.com/openstack-ansible/openstack-ansible-modules.git}
+
+# OS ISO for provisioning
+export CENTOS_ISO=${CENTOS_ISO:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1511.iso}
 export UBUNTU_ISO=${UBUNTU_ISO:-$PACKAGE_URL/ubuntu-14.04.3-server-amd64.iso}
-export TRUSTY_JUNO_PPA=${TRUSTY_JUNO_PPA:-$PACKAGE_URL/trusty-juno-ppa.tar.gz}
+
+# OpenStack Packages for deployment
+#export TRUSTY_JUNO_PPA=${TRUSTY_JUNO_PPA:-$PACKAGE_URL/trusty-juno-ppa.tar.gz}
 export TRUSTY_LIBERTY_PPA=${TRUSTY_LIBERTY_PPA:-$PACKAGE_URL/trusty-liberty-ppa.tar.gz}
-export CENTOS_ISO=${CENTOS_ISO:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1511.iso}
-export CENTOS7_JUNO_PPA=${CENTOS7_JUNO_PPA:-$PACKAGE_URL/centos7-juno-ppa.tar.gz}
+#export CENTOS7_JUNO_PPA=${CENTOS7_JUNO_PPA:-$PACKAGE_URL/centos7-juno-ppa.tar.gz}
 #export CENTOS7_KILO_PPA=${CENTOS7_KILO_PPA:-$PACKAGE_URL/centos7-kilo-ppa.tar.gz}
-export COMPASS_PKG=${COMPASS_PKG:-$PACKAGE_URL/centos7-compass-core.tar.gz}
+
+# SDN Packages for integration
+export APP_PACKAGE=${APP_PACKAGE:-$PACKAGE_URL/packages.tar.gz}
+
+# Other Packages
 export LOADERS=${LOADERS:-$PACKAGE_URL/loaders.tar.gz}
 export CIRROS=${CIRROS:-$PACKAGE_URL/cirros-0.3.3-x86_64-disk.img}
-export APP_PACKAGE=${APP_PACKAGE:-$PACKAGE_URL/packages.tar.gz}
-export PIP_REPO=${PIP_REPO:-$PACKAGE_URL/pip.tar.gz}
-export ANSIBLE_MODULE=${ANSIBLE_MODULE:-https://github.com/openstack-ansible/openstack-ansible-modules.git}
 export SPECIAL_DEBIAN_PACKAGE=${SPECIAL_DEBIAN_PACKAGE-$PACKAGE_URL/debian-packages.tar.gz}
-#end
+
 
 export PIP_CONF="https://bootstrap.pypa.io/ez_setup.py \
     https://pypi.python.org/packages/source/s/setuptools/setuptools-18.2.zip \