xci: playbooks: provision-vm-nodes: Simplify the provision VM playbook

The provision-vm-nodes playbook is only responsible for running bifrost
to provision the XCI virtual machines. As such, drop all the extra tasks
that this playbook performed in order to simplify it. This also drops
the XCI_EXTRA_VARS_PATH variable since it had a rather obscure usage
and there is not much value in passing inventory information outside of
XCI. All these will be handled in the scenarios themselves.

Change-Id: If5cb381a3d1e101100eb04478d80fb3045cdfaf8
Signed-off-by: Markos Chandras <mchandras@suse.de>

diff --git a/xci/config/user-vars b/xci/config/user-vars
index 14c0ca4..33b8393 100755 (executable)
--- 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 aa55f6c..8e91741 100644 (file)
--- a/xci/playbooks/provision-vm-nodes.yml
+++ b/xci/playbooks/provision-vm-nodes.yml
@@ -7,15 +7,6 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-- 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
@@ -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 }}"