From d635bd1f5762acd78545b650b2f55c112643b486 Mon Sep 17 00:00:00 2001 From: huangxiangyu Date: Thu, 18 May 2017 15:38:25 +0800 Subject: 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 --- deploy/launch.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'deploy/launch.sh') diff --git a/deploy/launch.sh b/deploy/launch.sh index 51094b29..d2ec0814 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -84,15 +84,10 @@ else log_info "deploy host macs: $machines" fi - -if [[ -z "$REDEPLOY_HOST" || "$REDEPLOY_HOST" == "false" ]]; then +if [[ "$REDEPLOY_HOST" != "true" ]]; then if ! set_compass_machine; then log_error "set_compass_machine fail" fi - - # FIXME: refactor compass adapter and conf code, instead of doing - # hack conf injection. - inject_compass_conf fi if [[ "$DEPLOY_HOST" == "true" || $REDEPLOY_HOST == "true" ]]; then -- cgit 1.2.3-korg