diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-22 15:37:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-22 15:37:09 +0000 |
| commit | 264c513842f00ea523a3b46259510b64c6d31075 (patch) | |
| tree | eda87b7cdadeb2d4f8bbb1ed7130a58f38ebcbea | |
| parent | fc1c3c9b848b28697f842363975ce74027a10f5e (diff) | |
| parent | 669e79ad41b59ec3901642cf0533e71ae412d589 (diff) | |
Merge changes from topic 'split-variable-creation-to-task'
* changes:
xci: Move the destroy-env.sh script to xci-deploy.sh
xci: provision-vm-nodes.yml: Merge plays
| -rw-r--r-- | xci/playbooks/provision-vm-nodes.yml | 29 | ||||
| -rwxr-xr-x | xci/xci-deploy.sh | 2 |
2 files changed, 2 insertions, 29 deletions
diff --git a/xci/playbooks/provision-vm-nodes.yml b/xci/playbooks/provision-vm-nodes.yml index 81fc5755..b9c13999 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,31 +59,7 @@ - "{{ 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/" dest: "{{ OPENSTACK_BIFROST_PATH }}" - -- hosts: localhost - connection: local - become: yes - 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: - chdir: "{{ OPENSTACK_BIFROST_PATH }}" diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh index 19f2c18a..78194fbe 100755 --- a/xci/xci-deploy.sh +++ b/xci/xci-deploy.sh @@ -114,6 +114,8 @@ fi #------------------------------------------------------------------------------- echo "Info: Starting provisining VM nodes using openstack/bifrost" echo "-------------------------------------------------------------------------" +cd $XCI_PATH/../bifrost/ +sudo -E bash ./scripts/destroy-env.sh cd $XCI_PATH/playbooks # NOTE(hwoarang) we need newer ansible to work on the following playbook sudo pip uninstall -y ansible || true |