From 5e02737fa5f23451bbb443bbf9d67cbac603dc46 Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Thu, 1 Feb 2018 15:56:03 +0800
Subject: Ansible callback support both V2.3 and V2.4

JIRA: COMPASS-585

1. Add conditional branch to support both ansible
versions
2. Keep callback in ansible_plugins directory which
will contains all plugins upcoming in the future

Change-Id: I11f3d9700e07ad5bd7f03ad56f4e0bc061df05ec
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---
 util/docker-compose/roles/compass/tasks/main.yml          | 15 +++++----------
 .../roles/compass/templates/docker-compose.yml.j2         |  1 +
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'util/docker-compose')

diff --git a/util/docker-compose/roles/compass/tasks/main.yml b/util/docker-compose/roles/compass/tasks/main.yml
index c7dba96b..46a413b8 100755
--- a/util/docker-compose/roles/compass/tasks/main.yml
+++ b/util/docker-compose/roles/compass/tasks/main.yml
@@ -95,6 +95,11 @@
              "{{ docker_compose_dir }}"/ansible/$i
     done
 
+- name: copy ansible plugins
+  copy:
+    src: "{{ compass_dir }}/deploy/ansible_plugins"
+    dest: "{{ docker_compose_dir }}"
+
 - name: create run dir
   file:
     path: "{{ docker_compose_dir }}/ansible/run"
@@ -123,16 +128,6 @@
   tags:
     - redploy
 
-- name: add ansible callback
-  shell: |
-    docker cp "{{ item }}" \
-    compass-deck:/root/compass-deck/bin/ansible_callbacks
-    docker cp "{{ item }}" \
-    compass-tasks:/opt/ansible_callbacks
-  with_items:
-    - "{{ compass_dir }}/deploy/status_callback.py"
-    - "{{ compass_dir }}/deploy/playbook_done.py"
-
 - name: rm ansible run
   shell: |
     docker exec compass-tasks bash -c "rm -rf /var/ansible/run/*"
diff --git a/util/docker-compose/roles/compass/templates/docker-compose.yml.j2 b/util/docker-compose/roles/compass/templates/docker-compose.yml.j2
index 7fc8ea3a..f7748634 100755
--- a/util/docker-compose/roles/compass/templates/docker-compose.yml.j2
+++ b/util/docker-compose/roles/compass/templates/docker-compose.yml.j2
@@ -43,6 +43,7 @@ services:
     volumes:
     - {{ docker_compose_dir }}/compass_conf:/etc/compass
     - {{ docker_compose_dir }}/ansible:/var/ansible
+    - {{ docker_compose_dir }}/ansible_plugins:/opt/ansible_plugins
     command:
     - /usr/local/bin/start.sh
 {% endif %}
-- 
cgit 1.2.3-korg