From 88e917ff19049358218068c63bac7427a1faeb0b Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Fri, 27 Apr 2018 20:25:30 +0100
Subject: xci: Remove intermediate scenarios tasks file
Now that the scenario role is recorded as a local fact, we can
include the role directly directly so we don't need the the
intermediate file anymore.
deploy-scenario:os-nosdn-nofeature
installer-type:osa
Change-Id: Ia3c5658826f115538b2a103d987ee8f33d3048b9
Signed-off-by: Markos Chandras <mchandras@suse.de>
---
xci/installer/kubespray/playbooks/configure-opnfvhost.yml | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
(limited to 'xci/installer/kubespray')
diff --git a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
index ac8988da..7626b949 100644
--- a/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/kubespray/playbooks/configure-opnfvhost.yml
@@ -43,7 +43,17 @@
file:
path: "{{ remote_xci_path }}/.cache/repos/kubespray/opnfv_inventory/group_vars"
state: directory
- - include: "{{ xci_path }}/xci/playbooks/bootstrap-scenarios.yml"
+
+ - name: Reload XCI deployment host facts
+ setup:
+ filter: ansible_local
+ gather_subset: "!all"
+ delegate_to: 127.0.0.1
+
+ - name: Prepare everything to run the {{ deploy_scenario }} role
+ include_role:
+ name: "{{ hostvars['opnfv'].ansible_local.xci.scenarios.role }}"
+
- name: Install required packages
package:
name: "{{ kube_require_packages[ansible_pkg_mgr] }}"
--
cgit