aboutsummaryrefslogtreecommitdiffstats
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
parentd5747030d62979b1178e6372907d7431012b7fd1 (diff)
parent4281121d0ce6240fa3928d2a2256fb621581b7ac (diff)
Merge "Seperate compass-tasks"
-rw-r--r--build/build.yaml11
-rw-r--r--deploy/conf/compass.conf9
-rwxr-xr-xutil/docker-compose/roles/compass/tasks/main.yml6
3 files changed, 21 insertions, 5 deletions
diff --git a/build/build.yaml b/build/build.yaml
index 4719c2c..93cb796 100644
--- a/build/build.yaml
+++ b/build/build.yaml
@@ -15,10 +15,15 @@ packages:
get_method: docker
url: opnfv/compass-deck:latest
- - name: compass-tasks
- description: "compass task container integrated with openstack-ansible and kubespray"
+ - name: compass-tasks-osa
+ description: "compass task container integrated with openstack-ansible"
get_method: docker
- url: opnfv/compass-tasks:latest
+ url: huangxiangyu/compass-tasks-osa:latest
+
+ - name: compass-tasks-k8s
+ description: "compass task container integrated with kubespray"
+ get_method: docker
+ url: huangxiangyu/compass-tasks-k8s:latest
- name: compass-cobbler
description: "cobbler container for compass"
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index 9d9145f..33fd620 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
diff --git a/util/docker-compose/roles/compass/tasks/main.yml b/util/docker-compose/roles/compass/tasks/main.yml
index c7dba96..911a284 100755
--- a/util/docker-compose/roles/compass/tasks/main.yml
+++ b/util/docker-compose/roles/compass/tasks/main.yml
@@ -19,7 +19,11 @@
{% for item in compass_images.results %}
{% if "ansible_facts" in item %}
{% set facts = item.ansible_facts %}
- {% set _ = image_dict.update({facts.image_name: facts.image_repo}) %}
+ {% set image_name = facts.image_name %}
+ {% if "compass_tasks" in image_name %}
+ {% set image_name = "compass_tasks" %}
+ {% endif %}
+ {% set _ = image_dict.update({image_name: facts.image_repo}) %}
{% endif %}
{% endfor %}
{% for key in image_dict %}