Update to 8.0.0~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 2741dc2dc243cad6a036c111b0b2e36fe6db7ad2..f72c700e3d3a4ce616f40fd605463d3ba2e3fb53 100644 (file)
--- a/rpm/SPECS/openstack-neutron.spec
+++ b/rpm/SPECS/openstack-neutron.spec
@@ -65,21 +65,12 @@ BuildRequires:      python-d2to1
 
 Requires:   ipset
 Requires:      dnsmasq-utils
+Requires:   python-oslo-middleware
 Requires:   python-netifaces
 Requires:      python-neutron = %{version}-%{release}
 Requires:      python-oslo-rootwrap
 Requires:      openstack-utils
-Requires:   openstack-neutron-bigswitch
-Requires:   openstack-neutron-brocade
-Requires:   openstack-neutron-cisco
-Requires:   openstack-neutron-hyperv
-Requires:   openstack-neutron-vmware
-Requires:   openstack-neutron-openvswitch
-Requires:   openstack-neutron-linuxbridge
-Requires:   openstack-neutron-metaplugin
-Requires:   openstack-neutron-mellanox
-Requires:   openstack-neutron-nec
-Requires:   openstack-neutron-nuage
+Requires:   conntrack-tools
 
 Requires(post):                chkconfig
 Requires(postun):      initscripts
@@ -110,36 +101,36 @@ Provides: python-quantum = %{version}-%{release}
 Obsoletes:     python-quantum < 2013.2-0.3.b3
 
 Requires:      MySQL-python
-Requires:      python-alembic >= 0.6.4
+Requires:      python-alembic >= 0.7.1
 Requires:      python-amqplib
 Requires:      python-anyjson >= 0.3.3
 Requires:      python-babel >= 1.3
-Requires:      python-eventlet >= 0.15.1
+Requires:      python-eventlet >= 0.15.2
 Requires:      python-greenlet >= 0.3.2
 Requires:      python-httplib2 >= 0.7.5
 Requires:      python-iso8601 >= 0.1.9
-Requires:       python-jsonrpclib
+Requires:   python-jsonrpclib
 Requires:      python-jinja2
-Requires:      python-keystoneclient >= 1:0.10.0
-Requires:       python-keystonemiddleware >= 1.0.0
-Requires:      python-kombu >= 2.4.8
+Requires:      python-keystoneclient >= 1:0.11.0
+Requires:   python-keystonemiddleware >= 1.0.0
+Requires:      python-kombu >= 2.5.0
 Requires:      python-lxml
-Requires:       python-oslo-messaging >= 1.4.0
+Requires:   python-oslo-messaging >= 1.4.0
 Requires:      python-oslo-rootwrap >= 1.3.0
-Requires:       python-requests >= 1.2.1
+Requires:   python-requests >= 2.2.0
 Requires:      python-paste-deploy >= 1.5.0
 Requires:      python-routes >= 1.12.3
-Requires:      python-sqlalchemy >= 0.8.4
+Requires:      python-sqlalchemy >= 0.9.7
 Requires:      python-webob >= 1.2.3
-Requires:      python-netaddr >= 0.7.6
-Requires:      python-oslo-config >= 1.4.0
-Requires:       python-oslo-db >= 0.4.0
+Requires:      python-netaddr >= 0.7.12
+Requires:      python-oslo-config >= 1.6.0
+Requires:   python-oslo-db >= 1.3.0
 Requires:      python-qpid
 Requires:      python-neutronclient >= 2.3.6
-Requires:      python-stevedore >= 0.14
+Requires:      python-stevedore >= 1.1.0
 Requires:      python-six >= 1.7.0
 
-Requires:   python-novaclient >= 1:2.17.0
+Requires:   python-novaclient >= 1:2.18.0
 Requires:      sudo
 
 
@@ -546,7 +537,6 @@ install -p -D -m 755 %{SOURCE15} %{buildroot}%{_initrddir}/neutron-dhcp-agent
 install -p -D -m 755 %{SOURCE16} %{buildroot}%{_initrddir}/neutron-l3-agent
 install -p -D -m 755 %{SOURCE17} %{buildroot}%{_initrddir}/neutron-metadata-agent
 install -p -D -m 755 %{SOURCE18} %{buildroot}%{_initrddir}/neutron-ovs-cleanup
-install -p -D -m 755 %{SOURCE19} %{buildroot}%{_initrddir}/neutron-lbaas-agent
 install -p -D -m 755 %{SOURCE30} %{buildroot}%{_initrddir}/neutron-mlnx-agent
 install -p -D -m 755 %{SOURCE31} %{buildroot}%{_initrddir}/neutron-vpn-agent
 install -p -D -m 755 %{SOURCE32} %{buildroot}%{_initrddir}/neutron-metering-agent
@@ -594,7 +584,7 @@ exit 0
 if [ $1 -eq 1 ] ; then
     # Initial installation
     /sbin/chkconfig --add neutron-server
-    for agent in dhcp l3 metadata lbaas; do
+    for agent in dhcp l3 metadata; do
       /sbin/chkconfig --add neutron-$agent-agent
     done
 fi
@@ -604,7 +594,7 @@ if [ $1 -eq 0 ] ; then
     # Package removal, not upgrade
     /sbin/service neutron-server stop >/dev/null 2>&1
     /sbin/chkconfig --del neutron-server
-    for agent in dhcp l3 metadata lbaas; do
+    for agent in dhcp l3 metadata; do
       /sbin/service neutron-$agent-agent stop >/dev/null 2>&1
       /sbin/chkconfig --del neutron-$agent-agent
     done
@@ -614,7 +604,7 @@ fi
 if [ $1 -ge 1 ] ; then
     # Package upgrade, not uninstall
     /sbin/service neutron-server condrestart >/dev/null 2>&1 || :
-    for agent in dhcp l3 metadata lbaas; do
+    for agent in dhcp l3 metadata; do
       /sbin/service neutron-$agent-agent condrestart >/dev/null 2>&1 || :
     done
 fi
@@ -792,7 +782,6 @@ fi
 %{_bindir}/neutron-debug
 %{_bindir}/neutron-dhcp-agent
 %{_bindir}/neutron-l3-agent
-%{_bindir}/neutron-lbaas-agent
 %{_bindir}/neutron-metadata-agent
 %{_bindir}/neutron-netns-cleanup
 %{_bindir}/neutron-ns-metadata-proxy
@@ -808,7 +797,6 @@ fi
 %{_initrddir}/neutron-l3-agent
 %{_initrddir}/neutron-metadata-agent
 %{_initrddir}/neutron-ovs-cleanup
-%{_initrddir}/neutron-lbaas-agent
 %dir %{_datadir}/neutron
 %{_datadir}/neutron/neutron-server.upstart
 %{_datadir}/neutron/neutron-dhcp-agent.upstart
@@ -820,10 +808,8 @@ fi
 %attr(-, root, neutron) %{_datadir}/neutron/neutron-dist.conf
 %attr(-, root, neutron) %{_datadir}/neutron/api-paste.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/dhcp_agent.ini
-%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/fwaas_driver.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/l3_agent.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metadata_agent.ini
-%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/lbaas_agent.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/policy.json
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/neutron.conf
 %config(noreplace) %{_sysconfdir}/neutron/rootwrap.conf
@@ -839,7 +825,6 @@ fi
 %{_datarootdir}/neutron/rootwrap/ipset-firewall.filters
 %{_datarootdir}/neutron/rootwrap/iptables-firewall.filters
 %{_datarootdir}/neutron/rootwrap/l3.filters
-%{_datarootdir}/neutron/rootwrap/lbaas-haproxy.filters
 
 
 %files -n python-neutron
@@ -865,7 +850,6 @@ fi
 %exclude %{python_sitelib}/neutron/plugins/vmware
 %{python_sitelib}/neutron-%%{version}*.egg-info
 
-
 %files bigswitch
 %doc LICENSE
 %{_bindir}/neutron-restproxy-agent
@@ -1043,11 +1027,8 @@ fi
 
 %files vpn-agent
 %doc LICENSE
-%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
 %{_initrddir}/neutron-vpn-agent
 %{_datadir}/neutron/neutron-vpn-agent.upstart
-%{_bindir}/neutron-vpn-agent
-%{_datarootdir}/neutron/rootwrap/vpnaas.filters
 
 
 %changelog