From 4281121d0ce6240fa3928d2a2256fb621581b7ac Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Sat, 27 Jan 2018 14:34:59 +0800
Subject: Seperate compass-tasks

JIRA: -

1. Keep openstack-ansible in compass-tasks-osa.
Keep kubespray in compass-tasks-k8s. Build
different compass-tasks in one tar ball. Identify
which one to use during docker-compose.

2. Temporarily using private docker repo.

3. COMPOSE_IMAGES is used to controll which components
to form compass-core regardless of specific repo. Set
default value for openstack and kubernetes when perform
single cluster deploy.

Change-Id: Ief52580e954c602575c9bf8abe5733c100876c7f
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---
 build/build.yaml                                 | 11 ++++++++---
 deploy/conf/compass.conf                         |  9 ++++++++-
 util/docker-compose/roles/compass/tasks/main.yml |  6 +++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/build/build.yaml b/build/build.yaml
index 4719c2c7..93cb796d 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 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
diff --git a/util/docker-compose/roles/compass/tasks/main.yml b/util/docker-compose/roles/compass/tasks/main.yml
index c7dba96b..911a2844 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 %}
-- 
cgit 1.2.3-korg