deploy/conf: support configurable docker registry 05/46905/1
authorYibo Cai <yibo.cai@arm.com>
Wed, 8 Nov 2017 06:18:31 +0000 (14:18 +0800)
committerYibo Cai <yibo.cai@arm.com>
Thu, 9 Nov 2017 03:06:16 +0000 (11:06 +0800)
Set COMPASS_DOCKER_REPO to use docker repos other than the default
one for x86_64(docker.io/compass4nfv).
E.g., to deploy Arm servers, it can be set to "linaro" repo.

Change-Id: Ief939e94d4a324dccd1ccf4be4ac75afb2cb0c3e
Signed-off-by: Yibo Cai <yibo.cai@arm.com>
deploy/conf/compass.conf

index 98ba302..dc3a975 100644 (file)
@@ -18,14 +18,17 @@ export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"}
 export COMPASS_REPO_PORT="5151"
 export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'}
 
-export COMPASS_DECK="compass4nfv/compass-deck"
-export COMPASS_TASKS="compass4nfv/compass-tasks-osa:euphrates"
+# Set docker registry for architectures other than x86_64
+COMPASS_DOCKER_REPO=${COMPASS_DOCKER_REPO:-compass4nfv}
+
+export COMPASS_DECK="$COMPASS_DOCKER_REPO/compass-deck"
+export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-osa:euphrates"
 
 if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
-  export COMPASS_TASKS="compass4nfv/compass-tasks-k8s"
+  export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-k8s"
 fi
 
-export COMPASS_COBBLER="compass4nfv/compass-cobbler"
-export COMPASS_DB="compass4nfv/compass-db"
-export COMPASS_MQ="compass4nfv/compass-mq"
-export COMPASS_REPO="compass4nfv/compass-repo-osa-ubuntu:euphrates"
+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"