summaryrefslogtreecommitdiffstats
path: root/util/docker-compose
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-01-27 14:34:59 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-01-31 09:44:47 +0800
commit4281121d0ce6240fa3928d2a2256fb621581b7ac (patch)
tree0063fc1a30ec1f6ebc3f9cbfc3ac942d31c22a1a /util/docker-compose
parent2c93fa28f1f1e78f4135f096f0c59e82963fd847 (diff)
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>
Diffstat (limited to 'util/docker-compose')
-rwxr-xr-xutil/docker-compose/roles/compass/tasks/main.yml6
1 files changed, 5 insertions, 1 deletions
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 %}