diff options
| author |   Yifei Xue <xueyifei@huawei.com> | 2018-02-06 01:44:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-06 01:44:37 +0000 |
| commit | a582c92b8cc3ee1b641a151373707e9a8604c8c8 (patch) | |
| tree | 00eedf056434ebb8913819f4b7988fce8ed815b0 /util/docker-compose/roles/compass/tasks | |
| parent | 794d5e92ebbba3818b23dd35f1399244a43cddfc (diff) | |
| parent | 5e02737fa5f23451bbb443bbf9d67cbac603dc46 (diff) | |
Merge "Ansible callback support both V2.3 and V2.4"
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 911a2844..d03a7bf2 100755 --- a/util/docker-compose/roles/compass/tasks/main.yml +++ b/util/docker-compose/roles/compass/tasks/main.yml @@ -99,6 +99,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" @@ -127,16 +132,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/*" |