From a360411cb8c775dffa24a4157cec2b566cbde6f3 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Tue, 7 Nov 2017 15:30:51 +0800 Subject: Add compass-docker-compose 1. Add ansible for docker compose containerized compass 2. deploy/conf/compass.conf no longer specify image tags for runtime. build.yaml now is added into compass tarball to be the only place determine image tags 3. This patch is based on patch: https://gerrit.opnfv.org/gerrit/#/c/47393/ use merged compass-tasks 4. Tempoarily using private docker repo for compass-tasks. Switch to opnfv repo when patch https://gerrit.opnfv.org/gerrit/#/c/47329/ is merged 5. Modify ansible callback module accrodingly Change-Id: I0728a9002a1cc7804c9e8f13bd1afdccb684a159 Signed-off-by: Harry Huang --- deploy/conf/compass.conf | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) (limited to 'deploy/conf') diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf index 78dd141b..9d9145f1 100644 --- a/deploy/conf/compass.conf +++ b/deploy/conf/compass.conf @@ -17,38 +17,4 @@ export NTP_SERVER="$COMPASS_SERVER" export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"} export COMPASS_REPO_PORT="5151" export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'} - -if [ "$COMPASS_ARCH" = "aarch64" ]; then - # Docker images for aarch64 - - # Arm images are temporarily held at dockerhub linaro repo - COMPASS_DOCKER_REPO=${COMPASS_DOCKER_REPO:-linaro} - - export COMPASS_DECK="$COMPASS_DOCKER_REPO/compass-deck" - export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-osa" - - if [[ "x"$KUBERNETES_VERSION != "x" ]]; then - export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-k8s" - fi - - export COMPASS_DB="$COMPASS_DOCKER_REPO/compass-db" - export COMPASS_MQ="$COMPASS_DOCKER_REPO/compass-mq" - export COMPASS_REPO="$COMPASS_DOCKER_REPO/compass-repo-osa-ubuntu:euphrates" - export COMPASS_COBBLER="$COMPASS_DOCKER_REPO/compass-cobbler" - -else - # Docker images for x86_64 - - export COMPASS_DECK="compass4nfv/compass-deck" - export COMPASS_TASKS="yifei0van0xue/compass-tasks-osa" - - if [[ "x"$KUBERNETES_VERSION != "x" ]]; then - export COMPASS_TASKS="compass4nfv/compass-tasks-k8s" - fi - - export COMPASS_DB="compass4nfv/compass-db" - export COMPASS_MQ="compass4nfv/compass-mq" - export COMPASS_REPO="compass4nfv/compass-repo-osa-ubuntu:euphrates" - export COMPASS_COBBLER="yifei0van0xue/compass-cobbler" - -fi +export COMPOSE_IMAGES="[compass-db,compass-mq,compass-deck,compass-tasks,compass-cobbler]" -- cgit 1.2.3-korg