diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2017-12-21 04:02:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-21 04:02:55 +0000 |
| commit | 4e9213e2facda368233187c469e12b88f0a9de7a (patch) | |
| tree | 1fe7e2bce4154a10a2f4bb23b11de909668fcd60 | |
| parent | 4f3401e17a3a0ac2eb4bc7ab242b33f2ab6ff3e8 (diff) | |
| parent | be0f0e9036991775a3e7e146723898acf361646b (diff) | |
Merge "deploy/conf: separate x86 and AArch64 docker image naming"
| -rw-r--r-- | deploy/conf/compass.conf | 44 |
1 files 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 |