From 4a7e1d41a5356f18b900986b06dccd968ab6b6a0 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 27 Jan 2016 15:20:07 -0500 Subject: Fixes various bugs and adds some improvements Changes Include: - Disables introspection. We don't currently use introspection for anything other than to just run it. Disabling it to increase deploy speed and reduce pxeboot issues. - Adds timeout to deploy of 90 minutes. Default heat timeout is 3-4 hours. - Fixes OVS bridge attach/detach for users who use PREFIX in their ifcfg instead of NETMASK - Adds nosdn deploy settings file, and allows nosdn deployments - Adds example inventory file to the docs dir Change-Id: Ic13d6c4d5f27bac25365e5951acdd9bd3e641a15 Signed-off-by: Tim Rozet --- build/opnfv-apex-common.spec | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'build/opnfv-apex-common.spec') diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 15838c04..752ce2e0 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -29,6 +29,7 @@ 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/os-nosdn-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.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 @@ -48,6 +49,7 @@ install docs/release-notes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes. install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/ install config/deploy/deploy_settings.yaml %{buildroot}%{_docdir}/opnfv/deploy_settings.yaml.example install config/deploy/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv/network_settings.yaml.example +install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/inventory.yaml.example %files %defattr(644, root, root, -) @@ -55,6 +57,7 @@ install config/deploy/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv %attr(755,root,root) %{_bindir}/opnfv-clean %{_var}/opt/opnfv/lib/common-functions.sh %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh +%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.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 @@ -67,8 +70,11 @@ install config/deploy/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv %doc %{_docdir}/opnfv/release-notes.html %doc %{_docdir}/opnfv/deploy_settings.yaml.example %doc %{_docdir}/opnfv/network_settings.yaml.example +%doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Wed Jan 27 2016 Tim Rozet - 2.1-4 +- Adds example inventory file and nosdn scenario * Wed Jan 20 2016 Dan Radez - 2.1-3 - Updating the installation instructions * Thu Jan 14 2016 Dan Radez - 2.1-2 -- cgit 1.2.3-korg