diff options
| author |   Justin chi <chigang@huawei.com> | 2017-11-21 02:24:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-21 02:24:18 +0000 |
| commit | 74d138271a37de21a5e4169c88418981884d2feb (patch) | |
| tree | 40cf69460d0c272c4c1e7c5f108fd3261f529ad9 | |
| parent | f3829d1e468ea7ff05c1aa7b447d9e5bbd0e048f (diff) | |
| parent | 3b6882797c740c8b29dbf1c35884661b60023c5f (diff) | |
Merge "deploy/conf: support configurable docker registry"
| -rw-r--r-- | deploy/conf/compass.conf | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf index 98ba3027..dc3a975e 100644 --- a/deploy/conf/compass.conf +++ b/deploy/conf/compass.conf @@ -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" |