diff options
Diffstat (limited to 'xci')
-rw-r--r-- | xci/installer/kubespray/playbooks/configure-opnfvhost.yml | 12 | ||||
-rw-r--r-- | xci/installer/osa/playbooks/configure-opnfvhost.yml | 10 | ||||
-rw-r--r-- | xci/playbooks/bootstrap-scenarios.yml | 43 |
3 files changed, 20 insertions, 45 deletions
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] }}" diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml index cca3e423..e2770989 100644 --- a/xci/installer/osa/playbooks/configure-opnfvhost.yml +++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml @@ -109,7 +109,15 @@ when: - lookup('env','http_proxy') != "" - - 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: bootstrap ansible on opnfv host command: "/bin/bash ./scripts/bootstrap-ansible.sh" diff --git a/xci/playbooks/bootstrap-scenarios.yml b/xci/playbooks/bootstrap-scenarios.yml deleted file mode 100644 index d1331252..00000000 --- a/xci/playbooks/bootstrap-scenarios.yml +++ /dev/null @@ -1,43 +0,0 @@ ---- -# -# This file is aimed to be used by scenarios to plug into the XCI. -# Ideally, all they need to do at this point is to include their -# role using a statement like the following one -# -# - name: Include foobar role -# include_role: -# name: "foobar" -# when: deploy_scenario == "foobar" - -- name: Prepare everything to run the os-nosdn-nofeature scenario - include_role: - name: "os-nosdn-nofeature" - when: deploy_scenario == 'os-nosdn-nofeature' -- name: Prepare everything to run the os-odl-nofeature scenario - include_role: - name: "os-odl-nofeature" - when: deploy_scenario == 'os-odl-nofeature' -- name: Prepare everything to run the os-odl-sfc scenario - include_role: - name: "os-odl-sfc" - when: deploy_scenario == 'os-odl-sfc' -- name: Prepare everything to run the os-odl-bgpvpn scenario - include_role: - name: "os-odl-bgpvpn" - when: deploy_scenario == 'os-odl-bgpvpn' -- name: Prepare everything to run the k8-canal-nofeature scenario - include_role: - name: "k8-canal-nofeature" - when: deploy_scenario == 'k8-canal-nofeature' -- name: Prepare everything to run the k8-canal-nofeature scenario - include_role: - name: "k8-calico-nofeature" - when: deploy_scenario == 'k8-calico-nofeature' -- name: Prepare everything to run the k8-flannel-nofeature scenario - include_role: - name: "k8-flannel-nofeature" - when: deploy_scenario == 'k8-flannel-nofeature' -- name: Prepare everything to run the k8-nosdn-nofeature scenario - include_role: - name: "k8-nosdn-nofeature" - when: deploy_scenario == 'k8-nosdn-nofeature' |