diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-09-22 14:06:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-22 14:06:10 +0000 |
| commit | 08fbdfaadb1cfba8ba46d1970d784bfbabc7e212 (patch) | |
| tree | c77fbff6cb8ff484cdce2e22b8012bac6727e458 /xci/playbooks/provision-vm-nodes.yml | |
| parent | 639ac5a794f961fb2a8db3cb3fb19681de26ab3c (diff) | |
| parent | 3a281e5c91bf05d94361af1ff5818657d92a1bfd (diff) | |
Merge changes from topic 'split-variable-creation-to-task'
* changes:
xci: playbooks: Include distribution var files dynamically
bifrost: scripts: Look for virtualbmc on bifrost virtualenv
xci: Gain elevated privileges to remove the XCI_DEVEL_ROOT directory
xci: Move VM provisioning to xci-deploy.sh
Diffstat (limited to 'xci/playbooks/provision-vm-nodes.yml')
| -rw-r--r-- | xci/playbooks/provision-vm-nodes.yml | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/xci/playbooks/provision-vm-nodes.yml b/xci/playbooks/provision-vm-nodes.yml index 0419dcfc..81fc5755 100644 --- a/xci/playbooks/provision-vm-nodes.yml +++ b/xci/playbooks/provision-vm-nodes.yml @@ -83,21 +83,12 @@ connection: local become: yes vars_files: - - ../var/{{ ansible_os_family }}.yml - ../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 }}" - -- hosts: localhost - connection: local - vars_files: - - ../var/{{ ansible_os_family }}.yml - - ../var/opnfv.yml - tasks: - - name: create and provision VM nodes for the flavor {{ XCI_FLAVOR }} - command: "/bin/bash ./scripts/bifrost-provision.sh" - args: - chdir: "{{ OPENSTACK_BIFROST_PATH }}" |