From 184a87be2b62cfeb6c7234b1da09c462e1008a46 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 27 Nov 2017 15:09:24 +0000 Subject: xci: Drop OPNFV_RELENG_DEV_PATH variable The OPNFV_RELENG_DEV_PATH variable was used to point to a releng-xci development repository. However, people normally set the current directory as the development one and they almost always want to test the current code in XCI. Using an secondary releng-xci tree as development repo is a very obscure case and it normally complicates things. As such, let drop this option and always use the current repository for development purposes. Change-Id: If111bf29a32a5f6ea28694f191645af0c6a87abc Signed-off-by: Markos Chandras --- xci/playbooks/configure-localhost.yml | 4 +--- xci/playbooks/configure-opnfvhost.yml | 4 +--- xci/playbooks/provision-vm-nodes.yml | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) (limited to 'xci/playbooks') diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml index e242a7ee..a0837117 100644 --- a/xci/playbooks/configure-localhost.yml +++ b/xci/playbooks/configure-localhost.yml @@ -40,12 +40,10 @@ file: ../var/{{ ansible_os_family }}.yml - name: Synchronize local development releng-xci repository to XCI paths synchronize: - src: "{{ OPNFV_RELENG_DEV_PATH }}" + src: "{{ XCI_PATH }}" dest: "{{ OPNFV_RELENG_PATH }}" recursive: yes delete: yes - when: - - OPNFV_RELENG_DEV_PATH != "" - hosts: localhost connection: local diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml index fdf21786..893f7a35 100644 --- a/xci/playbooks/configure-opnfvhost.yml +++ b/xci/playbooks/configure-opnfvhost.yml @@ -30,12 +30,10 @@ file: ../var/{{ ansible_os_family }}.yml - name: Synchronize local development releng-xci repository to XCI paths synchronize: - src: "{{ OPNFV_RELENG_DEV_PATH }}" + src: "{{ XCI_PATH }}" dest: "{{ OPNFV_RELENG_PATH }}" recursive: yes delete: yes - when: - - OPNFV_RELENG_DEV_PATH != "" - name: Synchronize local development openstack-ansible repository to XCI paths synchronize: src: "{{ OPENSTACK_OSA_DEV_PATH }}" diff --git a/xci/playbooks/provision-vm-nodes.yml b/xci/playbooks/provision-vm-nodes.yml index b9c13999..aa55f6ce 100644 --- a/xci/playbooks/provision-vm-nodes.yml +++ b/xci/playbooks/provision-vm-nodes.yml @@ -44,12 +44,10 @@ - OPENSTACK_BIFROST_DEV_PATH != "" - name: Synchronize local development releng-xci repository to XCI paths synchronize: - src: "{{ OPNFV_RELENG_DEV_PATH }}" + src: "{{ XCI_PATH }}" dest: "{{ OPNFV_RELENG_PATH }}" recursive: yes delete: yes - when: - - OPNFV_RELENG_DEV_PATH != "" - name: Copy extra vars to releng-xci and bifrost synchronize: src: "{{ XCI_EXTRA_VARS_PATH }}" -- cgit