2 files changed, 1 insertions, 36 deletions
diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index c2bf5291..5395405d 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -8,7 +8,6 @@ export EXT_NAT_GW=${EXT_NAT_GW:-192.16.1.1}
 export EXT_NAT_IP_START=${EXT_NAT_IP_START:-192.16.1.3}
 export EXT_NAT_IP_END=${EXT_NAT_IP_END:-192.16.1.254}
 export EXTERNAL_NIC=${EXTERNAL_NIC:-eth0}
-export CLUSTER_NAME="opnfv2"
 export DOMAIN="ods.com"
 export PARTITIONS="/=30%,/home=5%,/tmp=5%,/var=60%"
 export SUBNETS="10.1.0.0/24,172.16.2.0/24,172.16.3.0/24,172.16.4.0/24"
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]"