X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Fopnfv-apex-common.spec;h=958cb14a0f9fbe4b0da5348ff996d144e7f8a2d2;hb=a5967c102534cfe5a12850a8e34634e997c08b03;hp=89fb403064d99d86136b38104c3dcb21cdad1f34;hpb=d87cbc2f2aa88b9ba41dc34ca7098b9041fadd88;p=apex.git diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 89fb4030..958cb14a 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -8,10 +8,11 @@ License: Apache 2.0 URL: https://gerrit.opnfv.org/gerrit/apex.git Source0: opnfv-apex-common.tar.gz -BuildArch: noarch -BuildRequires: python-docutils python34-devel -Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools -Requires: initscripts net-tools iputils iproute iptables python34 +BuildArch: noarch +BuildRequires: python-docutils python34-devel +Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools +Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 +Requires: ipxe-roms-qemu >= 20160127-1 %description Scripts for OPNFV deployment using RDO Manager @@ -24,6 +25,8 @@ https://wiki.opnfv.org/apex rst2html docs/installation-instructions/index.rst docs/installation-instructions.html rst2html docs/release-notes/release-notes.rst docs/release-notes.html +%global __python %{__python3} + %install mkdir -p %{buildroot}%{_bindir}/ install ci/deploy.sh %{buildroot}%{_bindir}/opnfv-deploy @@ -31,22 +34,37 @@ install ci/clean.sh %{buildroot}%{_bindir}/opnfv-clean install ci/util.sh %{buildroot}%{_bindir}/opnfv-util mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/ +install config/deploy/os-nosdn-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml +install config/deploy/os-nosdn-ovs-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml install config/deploy/os-nosdn-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml +install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml +install config/deploy/os-nosdn-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-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-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.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/os-ocl-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml install config/network/network_settings.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings.yaml +install config/network/network_settings_v6.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings_v6.yaml + -mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/ +mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/python/apex install lib/common-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/utility-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ +install lib/python/apex-python-utils.py %{buildroot}%{_var}/opt/opnfv/lib/python/ mkdir -p %{buildroot}%{python3_sitelib}/apex/ install lib/python/apex/__init__.py %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/deploy_env.py %{buildroot}%{python3_sitelib}/apex/ install lib/python/apex/ip_utils.py %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/network_environment.py %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/network_settings.py %{buildroot}%{python3_sitelib}/apex/ +mkdir -p %{buildroot}%{python3_sitelib}/apex/common +install lib/python/apex/common/__init__.py %{buildroot}%{python3_sitelib}/apex/common/ +install lib/python/apex/common/constants.py %{buildroot}%{python3_sitelib}/apex/common/ +install lib/python/apex/common/utils.py %{buildroot}%{python3_sitelib}/apex/common/ mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ install lib/installer/onos/onos_gw_mac_update.sh %{buildroot}%{_var}/opt/opnfv/lib/installer/onos/ +install lib/installer/domain.xml %{buildroot}%{_var}/opt/opnfv/lib/installer/ mkdir -p %{buildroot}%{_docdir}/opnfv/ install LICENSE.rst %{buildroot}%{_docdir}/opnfv/ @@ -55,6 +73,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/network/network_settings.yaml %{buildroot}%{_docdir}/opnfv/network_settings.yaml.example +install config/network/network_settings_v6.yaml %{buildroot}%{_docdir}/opnfv/network_settings_v6.yaml.example install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/inventory.yaml.example %files @@ -64,26 +83,44 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %attr(755,root,root) %{_bindir}/opnfv-util %{_var}/opt/opnfv/lib/common-functions.sh %{_var}/opt/opnfv/lib/utility-functions.sh -%{python3_sitelib}/apex/ip_utils.py -%{python3_sitelib}/apex/__init__.py -%{python3_sitelib}/apex/__pycache__/* +%{_var}/opt/opnfv/lib/python/ +%{python3_sitelib}/apex/ %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh +%{_var}/opt/opnfv/lib/installer/domain.xml +%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.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/os-ocl-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/network_settings.yaml +%{_sysconfdir}/opnfv-apex/network_settings_v6.yaml %doc %{_docdir}/opnfv/LICENSE.rst %doc %{_docdir}/opnfv/installation-instructions.html %doc %{_docdir}/opnfv/release-notes.rst %doc %{_docdir}/opnfv/release-notes.html %doc %{_docdir}/opnfv/deploy_settings.yaml.example %doc %{_docdir}/opnfv/network_settings.yaml.example +%doc %{_docdir}/opnfv/network_settings_v6.yaml.example %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Tue Jun 14 2016 Feng Pan - 3.0-8 +- Add network_settings_v6.yaml +* Thu Jun 2 2016 Michael Chapman - 3.0-7 +- Add custom libvirt domain.xml. +* Wed Jun 1 2016 Feng Pan - 3.0-6 +- Add performance deployment file +* Sun May 15 2016 Feng Pan - 3.0-5 +- Fixes python3 dependency. +* Sun May 8 2016 Feng Pan - 3.0-4 +- Adds dependency for python34-setuptools +* Fri Apr 22 2016 Feng Pan - 3.0-3 +- Adds python network setting parsing lib. * Fri Apr 15 2016 Feng Pan - 3.0-2 - Adds python ip utility lib. * Mon Apr 11 2016 Tim Rozet - 3.0-1