diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-19 11:36:23 +0100 |
|---|---|---|
| committer | Markos Chandras <mchandras@suse.de> | 2017-09-21 21:51:43 +0100 |
| commit | 6d118054ec13a3723f7540208dba56debc716879 (patch) | |
| tree | 58f4c291f29c879c4ce33d5ffe85e30bc71d9e1f | |
| parent | 3a281e5c91bf05d94361af1ff5818657d92a1bfd (diff) | |
xci: provision-vm-nodes.yml: Merge plays
There is no need to have multiple plays executed on a single host group
so merge them all together into a single one.
Change-Id: Ie190cdecfbdcba48f75b21aa5930e1d9b8392aa0
Signed-off-by: Markos Chandras <mchandras@suse.de>
| -rw-r--r-- | xci/playbooks/provision-vm-nodes.yml | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/xci/playbooks/provision-vm-nodes.yml b/xci/playbooks/provision-vm-nodes.yml index 81fc5755..fd8c31d2 100644 --- a/xci/playbooks/provision-vm-nodes.yml +++ b/xci/playbooks/provision-vm-nodes.yml @@ -29,11 +29,6 @@ - { role: clone-repository, project: "opnfv/releng-xci", repo: "{{ OPNFV_RELENG_GIT_URL }}", dest: "{{ OPNFV_RELENG_PATH }}", version: "{{ OPNFV_RELENG_VERSION }}" } - { role: clone-repository, project: "opnfv/bifrost", repo: "{{ OPENSTACK_BIFROST_GIT_URL }}", dest: "{{ OPENSTACK_BIFROST_PATH }}", version: "{{ OPENSTACK_BIFROST_VERSION }}" } -- hosts: localhost - connection: local - gather_facts: true - vars_files: - - ../var/opnfv.yml tasks: - name: Load distribution variables include_vars: @@ -64,16 +59,6 @@ - "{{ OPENSTACK_BIFROST_PATH }}/playbooks/inventory" when: - XCI_EXTRA_VARS_PATH != "" - -- hosts: localhost - connection: local - gather_facts: true - vars_files: - - ../var/opnfv.yml - tasks: - - name: Load distribution variables - include_vars: - file: ../var/{{ ansible_os_family }}.yml - name: combine opnfv/releng-xci and openstack/bifrost scripts/playbooks copy: src: "{{ OPNFV_RELENG_PATH }}/bifrost/" @@ -81,13 +66,15 @@ - hosts: localhost connection: local - become: yes + become: true + gather_facts: true vars_files: - ../var/opnfv.yml tasks: - name: Load distribution variables include_vars: file: ../var/{{ ansible_os_family }}.yml + - name: destroy VM nodes created by previous deployment command: "/bin/bash ./scripts/destroy-env.sh" args: |