From: Markos Chandras <mchandras@suse.de>
Date: Tue, 26 Sep 2017 08:08:08 +0000 (+0100)
Subject: xci: configure-opnfvhost: Do not run 'remove-folders'
X-Git-Tag: 6.0.0~291^2~2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F43409%2F1;p=releng-xci.git
xci: configure-opnfvhost: Do not run 'remove-folders'
The OPNFV node is brand new and it doesn't have any traces
of XCI directories so there is no point in running the
'remove-folders' role.
Change-Id: Ic9b9203cc14abda2dab406de6a5feeef6a1b7e2a
Signed-off-by: Markos Chandras <mchandras@suse.de>
---
diff --git a/xci/file/aio/configure-opnfvhost.yml b/xci/file/aio/configure-opnfvhost.yml
index 535b14dc..f25476f9 100644
--- a/xci/file/aio/configure-opnfvhost.yml
+++ b/xci/file/aio/configure-opnfvhost.yml
@@ -1,13 +1,4 @@
---
-- hosts: opnfv
- remote_user: root
- gather_facts: true
- become: yes
- vars_files:
- - ../var/opnfv.yml
- roles:
- - role: remove-folders
-
- hosts: opnfv
remote_user: root
vars_files:
diff --git a/xci/playbooks/configure-opnfvhost.yml b/xci/playbooks/configure-opnfvhost.yml
index 73516d5a..173a29eb 100644
--- a/xci/playbooks/configure-opnfvhost.yml
+++ b/xci/playbooks/configure-opnfvhost.yml
@@ -7,19 +7,6 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-- hosts: opnfv
- remote_user: root
- become: yes
- vars_files:
- - ../var/flavor-vars.yml
- - ../var/opnfv.yml
- pre_tasks:
- - name: Load distribution variables
- include_vars:
- file: ../var/{{ ansible_os_family }}.yml
- roles:
- - role: remove-folders
-
- hosts: opnfv
remote_user: root
vars_files: