summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2018-02-05 10:56:58 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-05 10:56:58 +0000
commit8eb47e0ac350a4609f3b0573e5a8e3f38b7b44d2 (patch)
tree70e7c8f4ab76b0d4d3999597bf1ad44d83a784f5 /deploy
parentd5747030d62979b1178e6372907d7431012b7fd1 (diff)
parent4281121d0ce6240fa3928d2a2256fb621581b7ac (diff)
Merge "Seperate compass-tasks"
Diffstat (limited to 'deploy')
-rw-r--r--deploy/conf/compass.conf9
1 files changed, 8 insertions, 1 deletions
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index 9d9145f1..33fd6200 100644
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -17,4 +17,11 @@ export NTP_SERVER="$COMPASS_SERVER"
export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"}
export COMPASS_REPO_PORT="5151"
export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'}
-export COMPOSE_IMAGES="[compass-db,compass-mq,compass-deck,compass-tasks,compass-cobbler]"
+
+if [[ "x"$COMPOSE_IMAGES == "x" && "x"$OPENSTACK_VERSION != "x" ]]; then
+ export COMPOSE_IMAGES="[compass-db,compass-mq,compass-deck,compass-tasks-osa,compass-cobbler]"
+fi
+
+if [[ "x"$COMPOSE_IMAGES == "x" && "x"$KUBERNETES_VERSION != "x" ]]; then
+ export COMPOSE_IMAGES="[compass-db,compass-mq,compass-deck,compass-tasks-k8s,compass-cobbler]"
+fi