summaryrefslogtreecommitdiffstats
path: root/ci
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 /ci
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 'ci')
-rwxr-xr-xci/deploy_ci.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/ci/deploy_ci.sh b/ci/deploy_ci.sh
index 1f206210..80a2383b 100755
--- a/ci/deploy_ci.sh
+++ b/ci/deploy_ci.sh
@@ -54,4 +54,7 @@ echo 'OPENSTACK_VERSION='$OPENSTACK_VERSION
echo "#############################################"
set -x
+# clean up
+export TAR_URL=${TAR_URL:-$ISO_URL}
+sudo docker rm -f $(docker ps -aq)
$CI_DIR/../deploy.sh