diff options
author | 2018-02-01 15:56:03 +0800 | |
---|---|---|
committer | 2018-02-01 19:14:35 +0800 | |
commit | 5e02737fa5f23451bbb443bbf9d67cbac603dc46 (patch) | |
tree | b642b808ea19d13b8e7c370bafe4b431e4b7b560 /util/docker-compose/roles/compass/tasks | |
parent | bce23c34f221cdd9a41608c6505b359d99963afe (diff) |
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>
Diffstat (limited to 'util/docker-compose/roles/compass/tasks')
-rwxr-xr-x | util/docker-compose/roles/compass/tasks/main.yml | 15 |
1 files changed, 5 insertions, 10 deletions
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/*" |