From 56c6f66756d8096d0fad327cbb5f1c728d8c0974 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Fri, 15 Jan 2016 10:55:47 -0500 Subject: Adds scenario deploy settings files Changes include: - Scenarios for opencontrail, onos, sfc, odl l2/l3 - Minor fix to error print statement - Post Config is now disabled when using --flat Change-Id: I5f3686dda4c4a573b1777916669053593852676a Signed-off-by: Tim Rozet --- build/opnfv-apex-common.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'build/opnfv-apex-common.spec') diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 15fd9e1f..9aaf088d 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -29,7 +29,11 @@ install ci/deploy.sh %{buildroot}%{_bindir}/opnfv-deploy install ci/clean.sh %{buildroot}%{_bindir}/opnfv-clean mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/ -install config/deploy/deploy_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/deploy_settings.yaml +install config/deploy/os-odl_l2-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml +install config/deploy/os-odl_l2-sfc-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-ha.yaml +install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml +install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml +install config/deploy/os-opencontrail-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-opencontrail-nofeature-ha.yaml install config/deploy/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings.yaml mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/ @@ -49,7 +53,11 @@ install config/deploy/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv %attr(755,root,root) %{_bindir}/opnfv-deploy %attr(755,root,root) %{_bindir}/opnfv-clean %{_var}/opt/opnfv/lib/common-functions.sh -%{_sysconfdir}/opnfv-apex/deploy_settings.yaml +%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml +%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml +%{_sysconfdir}/opnfv-apex/os-opencontrail-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/network_settings.yaml %doc %{_docdir}/opnfv/LICENSE.rst %doc %{_docdir}/opnfv/installation-instructions.rst -- cgit 1.2.3-korg