From be0f0e9036991775a3e7e146723898acf361646b Mon Sep 17 00:00:00 2001
From: Yibo Cai <yibo.cai@arm.com>
Date: Wed, 6 Dec 2017 10:05:00 +0800
Subject: deploy/conf: separate x86 and AArch64 docker image naming

Latest update hard-coded some docker image names, which breaks
the deployment on Arm platform. This patch fixes the issue by
distinguishing docker image naming on different architecture.

This is an interim solution, and in the future, we may leverage
docker multi arch support to use consistent naming for
different architectures.

Change-Id: I5c59c12fb250c4e09d83582640e248075b5f7373
Signed-off-by: Yibo Cai <yibo.cai@arm.com>
---
 deploy/conf/compass.conf | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index 8a3bb3a3..78dd141b 100644
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -18,19 +18,37 @@ export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"}
 export COMPASS_REPO_PORT="5151"
 export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'}
 
-# Set docker registry for architectures other than x86_64
-COMPASS_DOCKER_REPO=${COMPASS_DOCKER_REPO:-compass4nfv}
+if [ "$COMPASS_ARCH" = "aarch64" ]; then
+  # Docker images for aarch64
 
-export COMPASS_DECK="$COMPASS_DOCKER_REPO/compass-deck"
-# export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-osa:euphrates"
-export COMPASS_TASKS="yifei0van0xue/compass-tasks-osa"
+  # Arm images are temporarily held at dockerhub linaro repo
+  COMPASS_DOCKER_REPO=${COMPASS_DOCKER_REPO:-linaro}
 
-if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
-  export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-k8s"
-fi
+  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_COBBLER="$COMPASS_DOCKER_REPO/compass-cobbler"
-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="yifei0van0xue/compass-cobbler"
+  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
-- 
cgit 1.2.3-korg