[openstack-neutron/el6-icehouse] Update to icehouse milestone 3 Add neutron-dhcp-agent dependency bz#1019487 Renamed nicira plugin in
Miguel Angel Ajo Pelayo
mangelajo at fedoraproject.org
Fri Mar 7 19:13:08 UTC 2014
commit d919a2d5abe38fd54bf3632e1a4b48796cf123f1
Author: Miguel Angel Ajo <mangelajo at redhat.com>
Date: Fri Mar 7 17:37:54 2014 +0100
Update to icehouse milestone 3
Add neutron-dhcp-agent dependency bz#1019487
Renamed nicira plugin into vmware bz#1058995
.gitignore | 1 +
openstack-neutron.spec | 103 +++++++++++++++++++++++++++++++++++++----------
sources | 2 +-
3 files changed, 83 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 54017ed..91d037c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/neutron-2013.2.1.tar.gz
/neutron-2014.1.b1.tar.gz
/neutron-2014.1.b2.tar.gz
+/neutron-2014.1.b3.tar.gz
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 5fc451e..028b938 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -1,8 +1,8 @@
-%global release_name havana
+%global release_name icehouse
Name: openstack-neutron
Version: 2014.1
-Release: 0.5.b2%{?dist}
+Release: 0.6.b3%{?dist}
Provides: openstack-quantum = %{version}-%{release}
Obsoletes: openstack-quantum < 2013.2-0.3.b3
@@ -12,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}.b2.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
@@ -49,7 +49,7 @@ Source42: neutron-metering-agent.upstart
Source90: neutron-dist.conf
#
-# patches_base=2014.1.b2+1
+# patches_base=2014.1.b3+1
#
Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
Patch0002: 0002-Remove-dnsmasq-version-warning.patch
@@ -77,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
@@ -112,21 +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-lxmal
+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
+# requires.txt six >=1.5.2 actually
Requires: sudo
%description -n python-neutron
@@ -210,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
@@ -282,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
@@ -405,13 +439,15 @@ This package contains the neutron agent responsible for generating bandwidth
utilization notifications.
-%package -n openstack-neutron-vmware-nsx
+%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-nsx
+%description -n openstack-neutron-vmware
This package adds VMWare NSX support for neutron
@@ -429,7 +465,7 @@ IPSec.
%prep
-%setup -q -n neutron-%{version}.b2
+%setup -q -n neutron-%{version}.b3
%patch0001 -p1
%patch0002 -p1
@@ -841,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
@@ -848,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
@@ -889,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
@@ -928,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
@@ -1005,11 +1051,17 @@ fi
%{_bindir}/neutron-metering-agent
-%files -n openstack-neutron-vmware-nsx
+%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
@@ -1022,6 +1074,13 @@ fi
%changelog
+* Fri Mar 07 2014 Miguel Ángel Ajo <majopela at 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 at redhat.com> - 2014.1.b2-5
- Fix missing dependency on python-stevedore
diff --git a/sources b/sources
index 1423194..eb01d1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7f6e34ddc6c4ae49c0d3a63fa432bae neutron-2014.1.b2.tar.gz
+25c470cc9b7f70972ad73a02e961b8ab neutron-2014.1.b3.tar.gz
More information about the scm-commits
mailing list