Code Review / openstack-build / neutron-build.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Update specs to v. 2014.1.b3
[openstack-build/neutron-build.git] / rpm / SPECS / openstack-neutron.spec
diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec
index 7bdabdc552a1743c6269b28d82dde1543775c9c6..994f5abbf5065f19456463285feb688b40728ca4 100644 (file)
--- a/rpm/SPECS/openstack-neutron.spec
+++ b/rpm/SPECS/openstack-neutron.spec
@@ -1,11 +1,8 @@
-#
-# This is 2013.2 release
-#
-%global release_name havana
+%global release_name icehouse 
 
 Name:          openstack-neutron
-Version:       2013.2
-Release:       11%{?dist}
+Version:       2014.1
+Release:       0.7.b3%{?dist}
 Provides:      openstack-quantum = %{version}-%{release}
 Obsoletes:     openstack-quantum < 2013.2-0.3.b3
 
@@ -15,7 +12,7 @@ Group:                Applications/System
 License:       ASL 2.0
 URL:           http://launchpad.net/neutron/
 
-Source0:       http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.tar.gz
+Source0:       http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.b3.tar.gz
 Source1:       neutron.logrotate
 Source2:       neutron-sudoers
 Source4:       neutron-server-setup
@@ -52,9 +49,10 @@ Source42:    neutron-metering-agent.upstart
 
 Source90:      neutron-dist.conf
 #
-# patches_base=2013.2+1
+# patches_base=2014.1.b3+1
 #
 Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
+Patch0002: 0002-Remove-dnsmasq-version-warning.patch
 
 BuildArch:     noarch
 
@@ -79,6 +77,11 @@ Requires:    openstack-utils
 Requires:      python-keystone
 Requires:      python-pbr
 
+# this require fixes bz#1019487 due to this patch 
+# https://review.openstack.org/#/c/61105/8/neutron/agent/linux/ovs_lib.py
+# which might need refactor to remove this dependency here
+Requires:       openstack-neutron-openvswitch
+
 Requires(post):                chkconfig
 Requires(postun):      initscripts
 Requires(preun):       chkconfig
@@ -114,20 +117,24 @@ Requires: python-anyjson
 Requires:      python-babel
 Requires:      python-eventlet
 Requires:      python-greenlet
-Requires:      python-httplib2
+Requires:      python-httplib2 >= 0.7.5
 Requires:      python-iso8601
 Requires:      python-jinja2-26
-Requires:      python-keystoneclient
+Requires:      python-keystoneclient >= 0.6.0
 Requires:      python-kombu
 Requires:      python-lxml
+Requires:      python-oslo-rootwrap
 Requires:      python-paste-deploy1.5
 Requires:      python-routes1.12
-Requires:      python-sqlalchemy0.7
-Requires:      python-webob1.2
+Requires:      python-sqlalchemy0.7 >= 0.7.8
+Requires:      python-webob1.2 >= 1.2.3
 Requires:      python-netaddr
 Requires:      python-oslo-config >= 1:1.2.0
 Requires:      python-qpid
-Requires:      python-neutronclient
+Requires:      python-neutronclient >= 2.3.4
+Requires:      python-stevedore
+Requires:      python-six >= 1.4.1
+# requires.txt six >=1.5.2 actually
 Requires:      sudo
 
 %description -n python-neutron
@@ -211,6 +218,21 @@ This package contains the neutron plugin that implements virtual
 networks using Microsoft Hyper-V.
 
 
+%package -n openstack-neutron-ibm
+Summary:       Neutron IBM plugin
+Group:         Applications/System
+
+Requires:      openstack-neutron = %{version}-%{release}
+
+
+%description -n openstack-neutron-ibm
+Neutron provides an API to dynamically request and configure virtual
+networks.
+
+This package contains the neutron plugin that implements virtual
+networks from IBM.
+
+
 %package -n openstack-neutron-linuxbridge
 Summary:       Neutron linuxbridge plugin
 Group:         Applications/System
@@ -283,6 +305,17 @@ This plugin implements Neutron v2 APIs with support for Mellanox embedded
 switch functionality as part of the VPI (Ethernet/InfiniBand) HCA.
 
 
+%package -n openstack-neutron-ofagent
+Summary:       Neutron ofagent plugin from ryu project
+Group:         Applications/system
+
+Requires:      openstack-neutron = %{version}-%{release}
+
+%description -n openstack-neutron-ofagent
+This plugin implements Neutron v2 APIs with support for the ryu ofagent
+plugin.
+
+
 %package -n openstack-neutron-nicira
 Summary:       Neutron Nicira plugin
 Group:         Applications/System
@@ -310,6 +343,7 @@ Obsoletes:  openstack-quantum-openvswitch < 2013.2-0.3.b3
 
 Requires:      openstack-neutron = %{version}-%{release}
 Requires:      openvswitch
+Requires:      python-psutil
 
 
 %description -n openstack-neutron-openvswitch
@@ -392,6 +426,18 @@ This package contains the neutron plugin that implements virtual
 networks using multiple other neutron plugins.
 
 
+%package -n openstack-neutron-vmware
+Summary:       Neutron VMWare NSX support
+Group:         Applications/System
+
+Requires:      openstack-neutron = %{version}-%{release}
+Provides:      openstack-neutron-nicira = %{version}-%{release}
+Obsoletes:     openstack-neutron-nicira < 2014.1-0.5.b2
+
+%description -n openstack-neutron-vmware
+This package adds VMWare NSX support for neutron
+
+
 %package -n openstack-neutron-metering-agent
 Summary:       Neutron bandwidth metering agent
 Group:         Applications/System
@@ -404,6 +450,7 @@ Neutron provides an API to measure bandwidth utilization
 This package contains the neutron agent responsible for generating bandwidth
 utilization notifications.
 
+
 %package -n openstack-neutron-vpn-agent
 Summary:       Neutron VPNaaS agent
 Group:         Applications/System
@@ -421,6 +468,7 @@ IPSec.
 %setup -q -n neutron-%{version}
 
 %patch0001 -p1
+%patch0002 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
@@ -575,6 +623,7 @@ if rpm --quiet -q openstack-quantum; then
       sed -re 's/[0-6]:off//g
                s/([0-6]):on\s*/\1/g
                s/quantum/neutron/g
+               s/^([a-z0-9-]+)\s+$/chkconfig \1 off/
                s/^([a-z0-9-]+)\s+([0-6]+)/chkconfig --levels \2 \1 on/' > %{_localstatedir}/lib/rpm-state/UPGRADE_FROM_QUANTUM
 fi
 
@@ -828,6 +877,7 @@ fi
 %exclude %{python_sitelib}/neutron/plugins/brocade
 %exclude %{python_sitelib}/neutron/plugins/cisco
 %exclude %{python_sitelib}/neutron/plugins/hyperv
+%exclude %{python_sitelib}/neutron/plugins/ibm
 %exclude %{python_sitelib}/neutron/plugins/linuxbridge
 %exclude %{python_sitelib}/neutron/plugins/metaplugin
 %exclude %{python_sitelib}/neutron/plugins/midonet
@@ -835,15 +885,18 @@ fi
 %exclude %{python_sitelib}/neutron/plugins/mlnx
 %exclude %{python_sitelib}/neutron/plugins/nec
 %exclude %{python_sitelib}/neutron/plugins/nicira
+%exclude %{python_sitelib}/neutron/plugins/ofagent
 %exclude %{python_sitelib}/neutron/plugins/openvswitch
 %exclude %{python_sitelib}/neutron/plugins/plumgrid
 %exclude %{python_sitelib}/neutron/plugins/ryu
+%exclude %{python_sitelib}/neutron/plugins/vmware
 %{python_sitelib}/neutron-%%{version}*.egg-info
 
 
 %files -n openstack-neutron-bigswitch
 %doc LICENSE
 %doc neutron/plugins/bigswitch/README
+%{_bindir}/neutron-restproxy-agent
 %{python_sitelib}/neutron/plugins/bigswitch
 %dir %{_sysconfdir}/neutron/plugins/bigswitch
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/bigswitch/*.ini
@@ -876,6 +929,16 @@ fi
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/hyperv/*.ini
 
 
+%files -n openstack-neutron-ibm
+%doc LICENSE
+%{_bindir}/neutron-ibm-agent
+%{_bindir}/quantum-ibm-agent
+%doc neutron/plugins/ibm/README
+%{python_sitelib}/neutron/plugins/ibm
+%dir %{_sysconfdir}/neutron/plugins/ibm
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/ibm/*.ini
+
+
 %files -n openstack-neutron-linuxbridge
 %doc LICENSE
 %doc neutron/plugins/linuxbridge/README
@@ -915,14 +978,10 @@ fi
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/mlnx/*.ini
 
 
-%files -n openstack-neutron-nicira
-%doc LICENSE
-%doc neutron/plugins/nicira/README
-%{_bindir}/neutron-check-nvp-config
-%{_bindir}/quantum-check-nvp-config
-%{python_sitelib}/neutron/plugins/nicira
-%dir %{_sysconfdir}/neutron/plugins/nicira
-%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nicira/*.ini
+%files -n openstack-neutron-ofagent
+%doc neutron/plugins/ofagent/README
+%{_bindir}/neutron-ofagent-agent
+%{python_sitelib}/neutron/plugins/ofagent
 
 
 %files -n openstack-neutron-openvswitch
@@ -992,6 +1051,19 @@ fi
 %{_bindir}/neutron-metering-agent
 
 
+%files -n openstack-neutron-vmware
+%doc LICENSE
+%{_bindir}/neutron-check-nvp-config
+%{_bindir}/quantum-check-nvp-config
+%{_bindir}/neutron-check-nsx-config
+%{_bindir}/neutron-nsx-manage
+%{python_sitelib}/neutron/plugins/vmware
+%dir %{_sysconfdir}/neutron/plugins/vmware
+%dir %{_sysconfdir}/neutron/plugins/nicira
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/vmware/*.ini
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/nicira/*.ini
+
+
 %files -n openstack-neutron-vpn-agent
 %doc LICENSE
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
@@ -1002,6 +1074,44 @@ fi
 
 
 %changelog
+* Tue Mar 11 2014 Miguel Ángel Ajo <majopela@redhat.com> - 2014.1.b3-7
+- Fixed a broken dependency/typo lxaml -> lxml
+- Enforcing python-six >= 1.4.1 at least
+
+* Fri Mar 07 2014 Miguel Ángel Ajo <majopela@redhat.com> - 2014.1.b3-6
+- Update to icehouse milestone 3
+- Add neutron-dhcp-agent dependency bz#1019487
+- Remove nicira plugin, renamed vmware-nsx to vmware bz#1058995
+- Add openstack-neutron-ibm plugin
+- Add openstack-neutron-ofagent plugin from ryu project
+
+* Tue Feb 04 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1.b2-5
+- Fix missing dependency on python-stevedore
+
+* Tue Feb 04 2014 Pádraig Brady <pbrady@redhat.com> - 2014.1.b2-4
+- Fix exception on systems with dnsmasq < 2.59
+
+* Mon Jan 27 2014 Terry Wilson <twilson@redhat.com> - 2014.1.b2-3
+- Update to icehouse milestone 2
+
+* Tue Jan 07 2014 Terry Wilson <twilson@redhat.com> - 2014.1.b1-2
+- Add python-psutil requirement for openvswitch agent, bz#1049235
+
+* Mon Dec 23 2013 Pádraig Brady <pbrady@redhat.com> - 2014.1.b1-1
+- Update to icehouse milestone 1
+
+* Wed Dec 18 2013 Pádraig Brady <pbrady@redhat.com> - 2013.2.1-1
+- Update to Havana stable release 2013.2.1
+
+* Fri Dec 13 2013 Terry Wilson <twilson@redhat.com> - 2013.2-13
+- QPID fixes from oslo-incubator, bz#1038711, bz#1038717
+- Remove dnsmasq version warning, bz#997961
+- Ensure that disabled services are properly handled on upgrade, bz#1040704
+
+* Mon Dec 09 2013 Terry Wilson <twilson@redhat.com> - 2013.2-12
+- Add vpnaas/fwaas configs to init scripts, bz#1032450
+- Pass neutron rootwrap.conf in sudoers.d/neutron, bz#984097
+
 * Wed Dec 04 2013 Terry Wilson <twilson@redhat.com> - 2013.2-11
 - Add missing debug and vpnaas rootwrap filters, bz#1034207