diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-12-12 09:04:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-12 09:04:56 +0000 |
| commit | eac401a7dc8bd555f6cf934fe2087186c82ff112 (patch) | |
| tree | e5ec9675cfcd0bb4421b0c6b1df85c3b161ab396 | |
| parent | 8a6f39e4a8fd11c2d458e5d8c2d86bdf56927471 (diff) | |
| parent | 598bfb45906ead1f20009020a2466f21985d210f (diff) | |
Merge "xci: playbooks: provision-vm-nodes: Simplify the provision VM playbook"
| -rwxr-xr-x | xci/config/user-vars | 3 | ||||
| -rw-r--r-- | xci/playbooks/provision-vm-nodes.yml | 27 |
2 files changed, 1 insertions, 29 deletions
diff --git a/xci/config/user-vars b/xci/config/user-vars index 14c0ca45..33b83930 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -59,6 +59,3 @@ export LOG_PATH=${LOG_PATH:-${XCI_DEVEL_ROOT}/opnfv/logs} export RUN_TEMPEST=${RUN_TEMPEST:-false} # Set this to to true to force XCI to re-create the target OS images export CLEAN_DIB_IMAGES=${CLEAN_DIB_IMAGES:-false} -# Set this to a full path pointing to extra config files (containing -# group_vars/all) -export XCI_EXTRA_VARS_PATH=${XCI_EXTRA_VARS_PATH:-""} diff --git a/xci/playbooks/provision-vm-nodes.yml b/xci/playbooks/provision-vm-nodes.yml index aa55f6ce..8e91741e 100644 --- a/xci/playbooks/provision-vm-nodes.yml +++ b/xci/playbooks/provision-vm-nodes.yml @@ -10,15 +10,6 @@ - hosts: localhost connection: local gather_facts: true - become: yes - vars_files: - - ../var/opnfv.yml - roles: - - role: remove-folders - -- hosts: localhost - connection: local - gather_facts: true vars_files: - ../var/opnfv.yml pre_tasks: @@ -26,7 +17,6 @@ include_vars: file: ../var/{{ ansible_os_family }}.yml roles: - - { 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 }}" } tasks: @@ -42,22 +32,7 @@ delete: yes when: - OPENSTACK_BIFROST_DEV_PATH != "" - - name: Synchronize local development releng-xci repository to XCI paths - synchronize: - src: "{{ XCI_PATH }}" - dest: "{{ OPNFV_RELENG_PATH }}" - recursive: yes - delete: yes - - name: Copy extra vars to releng-xci and bifrost - synchronize: - src: "{{ XCI_EXTRA_VARS_PATH }}" - dest: "{{ item }}" - with_items: - - "{{ OPNFV_RELENG_PATH }}/xci/playbooks" - - "{{ OPENSTACK_BIFROST_PATH }}/playbooks/inventory" - when: - - XCI_EXTRA_VARS_PATH != "" - name: combine opnfv/releng-xci and openstack/bifrost scripts/playbooks copy: - src: "{{ OPNFV_RELENG_PATH }}/bifrost/" + src: "{{ XCI_PATH}}/bifrost/" dest: "{{ OPENSTACK_BIFROST_PATH }}" |