X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Frpm_specs%2Fopnfv-apex-common.spec;h=05fbbbd38b3ac8631bc9ba6f4768809a42de1e54;hb=5bfa41f042beab7575c94979ac881ce9e721be03;hp=6ad5782f7388df48a144b7e381ae5730ced4a077;hpb=4523fd8c90acf923a526cae390922c1dbcd6220e;p=apex.git diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 6ad5782f..05fbbbd3 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -1,5 +1,5 @@ Name: opnfv-apex-common -Version: 3.0 +Version: 5.0 Release: %{release} Summary: Scripts for OPNFV deployment using RDO Manager @@ -10,8 +10,8 @@ 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 python34-yaml python3-jinja2 python3-ipmi +Requires: opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools libvirt-python +Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 python3-ipmi python2-virtualbmc Requires: ipxe-roms-qemu >= 20160127-1 %description @@ -22,8 +22,8 @@ https://wiki.opnfv.org/apex %setup -q %build -rst2html docs/installationprocedure/index.rst docs/installation-instructions.html -rst2html docs/releasenotes/release-notes.rst docs/release-notes.html +rst2html docs/release/installation/index.rst docs/release/installation/installation-instructions.html +rst2html docs/release/release-notes/release-notes.rst docs/release/release-notes/release-notes.html %global __python %{__python3} @@ -39,21 +39,30 @@ install build/bash_completion_apex %{buildroot}%{_sysconfdir}/bash_completion.d/ 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-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml -install config/deploy/os-nosdn-ovs-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml +install config/deploy/os-nosdn-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-ha.yaml +install config/deploy/os-nosdn-ovs_dpdk-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-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_l2-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-ha.yaml -install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml -install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-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-nosdn-ovs_dpdk-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml +install config/deploy/os-nosdn-kvm-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml +install config/deploy/os-nosdn-kvm-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml +install config/deploy/os-odl-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml +install config/deploy/os-odl-bgpvpn-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml +install config/deploy/os-odl-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml +install config/deploy/os-odl_netvirt-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_netvirt-fdio-noha.yaml +install config/deploy/os-odl-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml +install config/deploy/os-odl-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-nofeature-ha.yaml +install config/deploy/os-odl-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-nofeature-noha.yaml +install config/deploy/os-odl-ovs_dpdk-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-ha.yaml +install config/deploy/os-odl-ovs_dpdk-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-noha.yaml +install config/deploy/os-odl-gluon-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml +install config/deploy/os-ovn-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-ovn-nofeature-noha.yaml install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml install config/deploy/os-onos-sfc-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-sfc-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 +install config/network/network_settings_vpp.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/network_settings_vpp.yaml mkdir -p %{buildroot}%{_var}/opt/opnfv/lib/python/apex @@ -65,11 +74,13 @@ install lib/undercloud-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/overcloud-deploy-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/post-install-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ install lib/utility-functions.sh %{buildroot}%{_var}/opt/opnfv/lib/ +install lib/configure-vm %{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_settings.py %{buildroot}%{python3_sitelib}/apex/ install lib/python/apex/ip_utils.py %{buildroot}%{python3_sitelib}/apex/ +install lib/python/apex/inventory.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/ install lib/python/apex/clean.py %{buildroot}%{python3_sitelib}/apex/ @@ -78,17 +89,17 @@ install lib/python/apex/common/__init__.py %{buildroot}%{python3_sitelib}/apex/c 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/ -install docs/installation-instructions.html %{buildroot}%{_docdir}/opnfv/ -install docs/releasenotes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst -install docs/release-notes.html %{buildroot}%{_docdir}/opnfv/ +install docs/release/installation/installation-instructions.html %{buildroot}%{_docdir}/opnfv/ +install docs/release/release-notes/index.rst %{buildroot}%{_docdir}/opnfv/release-notes.rst +install docs/release/release-notes/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/network/network_settings_vpp.yaml %{buildroot}%{_docdir}/opnfv/network_settings_vpp.yaml.example install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/inventory.yaml.example %files @@ -104,28 +115,37 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_var}/opt/opnfv/lib/overcloud-deploy-functions.sh %{_var}/opt/opnfv/lib/post-install-functions.sh %{_var}/opt/opnfv/lib/utility-functions.sh +%{_var}/opt/opnfv/lib/configure-vm %{_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}/bash_completion.d/apex %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml -%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-ha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-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_l2-bgpvpn-ha.yaml -%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml -%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml -%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl_netvirt-fdio-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-nofeature-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-nofeature-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml +%{_sysconfdir}/opnfv-apex/os-ovn-nofeature-noha.yaml %{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-onos-sfc-ha.yaml %{_sysconfdir}/opnfv-apex/os-ocl-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/network_settings.yaml %{_sysconfdir}/opnfv-apex/network_settings_v6.yaml +%{_sysconfdir}/opnfv-apex/network_settings_vpp.yaml %doc %{_docdir}/opnfv/LICENSE.rst %doc %{_docdir}/opnfv/installation-instructions.html %doc %{_docdir}/opnfv/release-notes.rst @@ -133,9 +153,37 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %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/network_settings_vpp.yaml.example %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Mon May 08 2017 Dan Radez - 5.0-3 +- adding configure-vm +* Tue Apr 11 2017 Dan Radez - 5.0-2 +- Remove l2 scenario files +* Tue Apr 04 2017 Dan Radez - 5.0-1 +- Version update for Euphrates +- rename to ovs_dpdk +* Wed Mar 29 2017 Dan Radez - 4.0-9 +- Remove odl_l2-nofeature scenario file +- rename all odl_l3 scenario files to odl +* Thu Mar 23 2017 Tim Rozet - 4.0-8 +- Adds os-odl_l3-ovs-ha and noha scenarios +* Mon Mar 12 2017 Feng Pan - 4.0-7 +- Add os-nosdn-fdio-ha.yaml +* Fri Mar 10 2017 Feng Pan - 4.0-6 +- Add os-odl_l3-fdio-noha.yaml and os-odl_l3-fdio-ha.yaml +* Wed Mar 08 2017 Dan Radez - 4.0-5 +- Adding kvm4nfv files +- Adding OVN files +* Tue Feb 14 2017 Feng Pan - 4.0-4 +- Add network_settings_vpp.yaml +* Fri Feb 3 2017 Nikolas Hermanns - 4.0-3 +- change odl_l3-gluon-noha to odl-gluon-noha +* Thu Feb 2 2017 Feng Pan - 4.0-2 +- Add odl_l3-gluon-noha config file +* Wed Nov 2 2016 Dan Radez - 4.0-1 +- Version update for Danube * Fri Sep 16 2016 Dan Radez - 3.0-13 - adding bash completion script * Tue Aug 30 2016 Tim Rozet - 3.0-12