summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorhuangxiangyu <huangxiangyu5@huawei.com>2017-05-18 15:38:25 +0800
committerhuangxiangyu <huangxiangyu5@huawei.com>2017-06-09 10:07:11 +0800
commitd635bd1f5762acd78545b650b2f55c112643b486 (patch)
treec539533023277ed1fe95d4a65e483a458801f869 /build
parentfe888225b54b228ab319573697daab9a0523f2bb (diff)
support Containerized compass-core
JIRA: COMPASS-534 1. rm compass vm and add ansible to bring up 5 compass containers 2. use tar package instead of compass.iso which contains compass docker images, OS ISO, PPA, pip packages. 3. modify client.py to communicate with containerized compass-core 4. modify cobbler files and ansible callback files to adapt with containerized compass-core 5. upgrade openstack version to ocata 6. use the openstack-ansible to deploy openstack 7. virtual deploy external use nat Change-Id: Ifa2a3f5b8c7c32224ac4276fd3d4cc2b0d270a26 Signed-off-by: huangxiangyu <huangxiangyu5@huawei.com>
Diffstat (limited to 'build')
-rw-r--r--build/build.conf37
1 files changed, 25 insertions, 12 deletions
diff --git a/build/build.conf b/build/build.conf
index 101f01ba..fea50c80 100644
--- a/build/build.conf
+++ b/build/build.conf
@@ -1,29 +1,42 @@
TIMEOUT=10
+# PACKAGE_URL will be reset in Jenkins for different branch
+export PACKAGE_URL=${PACKAGE_URL:-http://artifacts.opnfv.org/compass4nfv/package/master}
+
# Jumphost OS version
-export CENTOS_BASE=${CENTOS_BASE:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1511.iso}
+# 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:-https://github.com/openstack/compass-web.git}
-export COMPASS_INSTALL=${COMPASS_INSTALL:-http://github.com/baigk/compass-install.git}
+# export COMPASS_CORE=${COMPASS_CORE:-https://github.com/openstack/compass-core.git}
+# export COMPASS_WEB=${COMPASS_WEB:-https://github.com/openstack/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 PIP_OPENSTACK_REPO=${PIP_OPENSTACK_REPO:-$PACKAGE_URL/pip-openstack.tar.gz}
+# export COMPASS_PKG=${COMPASS_PKG:-$PACKAGE_URL/centos7-compass-core.tar.gz}
+# export PIP_REPO=${PIP_REPO:-$PACKAGE_URL/pip.tar.gz}
+# export PIP_OPENSTACK_REPO=${PIP_OPENSTACK_REPO:-$PACKAGE_URL/pip-openstack.tar.gz}
# OS ISO for provisioning
export CENTOS_ISO=${CENTOS_ISO:-$PACKAGE_URL/CentOS-7-x86_64-Minimal-1611.iso} # centos 7.3
export UBUNTU_ISO=${UBUNTU_ISO:-$PACKAGE_URL/ubuntu-16.04-server-amd64.iso} # ubuntu 16.04
# OpenStack Packages for deployment
-export XENIAL_NEWTON_PPA=${XENIAL_NEWTON_PPA:-$PPA_URL/xenial-newton-ppa.tar.gz}
-export CENTOS7_NEWTON_PPA=${CENTOS7_NEWTON_PPA:-$PPA_URL/centos7-newton-ppa.tar.gz}
+# export UBUNTU_PPA=${UBUNTU_PPA:-$PACKAGE_URL/xenial-ocata-ppa.tar.gz}
+# export CENTOS_PPA=${CENTOS_PPA:-$PACKAGE_URL/centos7-ocata-ppa.tar.gz}
# SDN Packages for integration
-export APP_PACKAGE=${APP_PACKAGE:-$FEATURE_URL/packages.tar.gz}
+# 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 LOADERS=${LOADERS:-$PACKAGE_URL/loaders.tar.gz}
+# export CIRROS=${CIRROS:-$PACKAGE_URL/cirros-0.3.3-x86_64-disk.img}
+
+# Containerized compass-core docker images
+export COMPASS_DECK=${COMPASS_DECK:-huangxiangyu/compass-deck:v0.2}
+export COMPASS_TASKS=${COMPASS_TASKS:-wtwde/compass-tasks-osa:v0.2}
+export COMPASS_COBBLER=${COMPASS_COBBLER:-huangxiangyu/compass-cobbler:v0.1}
+export COMPASS_DB=${COMPASS_DB:-huangxiangyu/compass-db:v0.1}
+export COMPASS_MQ=${COMPASS_MQ:-huangxiangyu/compass-mq:v0.1}
+
+# Containerized compass-core ansible
+export COMPASS_COMPOSE=${COMPASS_COMPOSE:-https://github.com/hexhxy/compass-docker-compose.git}