diff options
| author |   wutianwei <wutianwei1@huawei.com> | 2018-03-22 16:11:52 +0800 |
|---|---|---|
| committer | wutianwei <wutianwei1@huawei.com> | 2018-03-22 19:38:36 +0800 |
| commit | 59a685e470e68368f96de9d672bd4a9dfa3f52fd (patch) | |
| tree | 7676b2369c7fcb4536a699dac643c86d5e5b0e16 /xci/installer/osa | |
| parent | 8cb2bc0cdf0565ce59546b1ec2aac513fb7fecaa (diff) | |
Move bootstrap-scenarios.yml to common playbooks directory
Move bootstrap-scenarios.yml from installer/osa/playbooks/bootstrap-scenarios.yml
to playbooks/bootstrap-scenarios.yml as a common playbook.
So we can use this file to bootstarap k8s-* scenarios, instead of creating a new
file under installer/kubespray/playbooks/bootstrap-scenarios.yml
Change-Id: Ic31ee00e1a0863f48fb86298d7c00fa8420fa28a
Signed-off-by: wutianwei <wutianwei1@huawei.com>
Diffstat (limited to 'xci/installer/osa')
| -rw-r--r-- | xci/installer/osa/playbooks/bootstrap-scenarios.yml | 27 | ||||
| -rw-r--r-- | xci/installer/osa/playbooks/configure-opnfvhost.yml | 2 |
2 files changed, 1 insertions, 28 deletions
diff --git a/xci/installer/osa/playbooks/bootstrap-scenarios.yml b/xci/installer/osa/playbooks/bootstrap-scenarios.yml deleted file mode 100644 index 6546d5ce..00000000 --- a/xci/installer/osa/playbooks/bootstrap-scenarios.yml +++ /dev/null @@ -1,27 +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' diff --git a/xci/installer/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml index 3a904aed..47e9a65f 100644 --- a/xci/installer/osa/playbooks/configure-opnfvhost.yml +++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml @@ -110,7 +110,7 @@ shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/openstack_services.yml {{openstack_osa_path}}/playbooks/defaults/repo_packages/openstack_services.yml" when: - openstack_osa_version != "master" - - include: bootstrap-scenarios.yml + - include: "{{ xci_path }}/xci/playbooks/bootstrap-scenarios.yml" - name: bootstrap ansible on opnfv host command: "/bin/bash ./scripts/bootstrap-ansible.sh" args: |