[openstack-neutron/el6-icehouse] Update to upstream 2014.1.rc1

Wed Apr 2 16:09:57 UTC 2014

commit 537a312a5eb03367d8977201a669ce36c9f3f952
Author: Terry Wilson <twilson at redhat.com>
Date:   Wed Apr 2 11:00:40 2014 -0500

    Update to upstream 2014.1.rc1

 .gitignore                                         |    1 +
 ...-use-parallel-installed-versions-in-RHEL6.patch |    2 +-
 0002-Remove-dnsmasq-version-warning.patch          |    4 +-
 ...e-agents-table-when-ML2-core_plugin-is-us.patch |   23 ----------
 openstack-neutron.spec                             |   43 ++++++++++++++++---
 sources                                            |    2 +-
 6 files changed, 41 insertions(+), 34 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 91d037c..674af4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /neutron-2014.1.b1.tar.gz
 /neutron-2014.1.b2.tar.gz
 /neutron-2014.1.b3.tar.gz
+/neutron-2014.1.rc1.tar.gz
diff --git a/0001-use-parallel-installed-versions-in-RHEL6.patch b/0001-use-parallel-installed-versions-in-RHEL6.patch
index 161b61f..f52a583 100644
--- a/0001-use-parallel-installed-versions-in-RHEL6.patch
+++ b/0001-use-parallel-installed-versions-in-RHEL6.patch
@@ -1,4 +1,4 @@
-From 27a00c034844e565249efe5588a52f06ce4e507b Mon Sep 17 00:00:00 2001
+From 4cc2b00a93126c5da672514fad7e356e79f2b8e6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Fri, 13 Apr 2012 17:24:40 +0100
 Subject: [PATCH] use parallel installed versions in RHEL6
diff --git a/0002-Remove-dnsmasq-version-warning.patch b/0002-Remove-dnsmasq-version-warning.patch
index 7e44eb9..083a84d 100644
--- a/0002-Remove-dnsmasq-version-warning.patch
+++ b/0002-Remove-dnsmasq-version-warning.patch
@@ -1,4 +1,4 @@
-From 9f4fc35ca3a02d137b88332bbed06c9731a6861e Mon Sep 17 00:00:00 2001
+From 268532256d701f2f9d7e10b01a65685e118800dc Mon Sep 17 00:00:00 2001
 From: Terry Wilson <twilson at redhat.com>
 Date: Fri, 13 Dec 2013 09:41:43 -0600
 Subject: [PATCH] Remove dnsmasq version warning
@@ -8,7 +8,7 @@ Subject: [PATCH] Remove dnsmasq version warning
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py
-index 08cedfd..21eaf0a 100644
+index e650c00..fdac998 100644
 --- a/neutron/agent/linux/dhcp.py
 +++ b/neutron/agent/linux/dhcp.py
 @@ -286,10 +286,13 @@ class Dnsmasq(DhcpLocalProcess):
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index a80f381..94cc05c 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1
-Release:	0.8.b3%{?dist}
+Release:	0.9.rc1%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -12,7 +12,8 @@ Group:		Applications/System
 License:	ASL 2.0
 URL:		http://launchpad.net/neutron/
 
-Source0:	http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.b3.tar.gz
+#Source0:	http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.rc1.tar.gz
+Source0:	http://launchpad.net/neutron/%{release_name}/%{release_name}-rc1/+download/neutron-%{version}.rc1.tar.gz
 Source1:	neutron.logrotate
 Source2:	neutron-sudoers
 Source4:	neutron-server-setup
@@ -49,11 +50,10 @@ Source42:	neutron-metering-agent.upstart
 
 Source90:	neutron-dist.conf
 #
-# patches_base=2014.1.b3+1
+# patches_base=2014.1.rc1+1
 #
 Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
 Patch0002: 0002-Remove-dnsmasq-version-warning.patch
-Patch0003: 0003-Merge-Create-agents-table-when-ML2-core_plugin-is-us.patch
 
 BuildArch:	noarch
 
@@ -335,6 +335,21 @@ This package contains the neutron plugin that implements virtual
 networks using Nicira NVP.
 
 
+%package -n openstack-neutron-oneconvergence-nvsd
+Summary:       Neutron One Convergence NVSD plugin
+Group:         Applications/System
+
+Requires:      openstack-neutron = %{version}-%{release}
+
+
+%description -n openstack-neutron-oneconvergence-nvsd
+Neutron provides an API to dynamnically request and configure virtual
+networks.
+
+This package contains the neutron plugin that implements virtual
+networks using One Convergence NVSD
+
+
 %package -n openstack-neutron-openvswitch
 Summary:	Neutron openvswitch plugin
 Group:		Applications/System
@@ -344,7 +359,6 @@ Obsoletes:	openstack-quantum-openvswitch < 2013.2-0.3.b3
 
 Requires:	openstack-neutron = %{version}-%{release}
 Requires:	openvswitch
-Requires:	python-psutil
 
 
 %description -n openstack-neutron-openvswitch
@@ -466,11 +480,10 @@ IPSec.
 
 
 %prep
-%setup -q -n neutron-%{version}.b3
+%setup -q -n neutron-%{version}.rc1
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
 
@@ -888,6 +901,7 @@ fi
 %exclude %{python_sitelib}/neutron/plugins/nec
 %exclude %{python_sitelib}/neutron/plugins/nicira
 %exclude %{python_sitelib}/neutron/plugins/ofagent
+%exclude %{python_sitelib}/neutron/plugins/oneconvergence
 %exclude %{python_sitelib}/neutron/plugins/openvswitch
 %exclude %{python_sitelib}/neutron/plugins/plumgrid
 %exclude %{python_sitelib}/neutron/plugins/ryu
@@ -902,6 +916,7 @@ fi
 %{python_sitelib}/neutron/plugins/bigswitch
 %dir %{_sysconfdir}/neutron/plugins/bigswitch
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/bigswitch/*.ini
+%doc %{_sysconfdir}/neutron/plugins/bigswitch/README
 
 
 %files -n openstack-neutron-brocade
@@ -986,6 +1001,16 @@ fi
 %{python_sitelib}/neutron/plugins/ofagent
 
 
+%files -n openstack-neutron-oneconvergence-nvsd
+%doc LICENSE
+%doc neutron/plugins/oneconvergence/README
+%dir %{_sysconfdir}/neutron/plugins/oneconvergence
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/oneconvergence/nvsdplugin.ini
+%{_bindir}/neutron-nvsd-agent
+%{_bindir}/quantum-nvsd-agent
+%{python_sitelib}/neutron/plugins/oneconvergence
+
+
 %files -n openstack-neutron-openvswitch
 %doc LICENSE
 %doc neutron/plugins/openvswitch/README
@@ -1076,6 +1101,10 @@ fi
 
 
 %changelog
+* Wed Apr 02 2014 Terry Wilson <twilson at redhat.com> 2014.1-0.9.rc1
+- Update to upstream 2014.1.rc1
+- Remove python-psutil requires
+
 * Wed Mar 19 2014 Miguel Ángel Ajo <majopela at redhat.com> - 2014.1.b3-8
 - Create agents table when ML2 core_plugin is used
  
diff --git a/sources b/sources
index eb01d1e..2fac707 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-25c470cc9b7f70972ad73a02e961b8ab  neutron-2014.1.b3.tar.gz
+7900b332e301f9f2023fc335928ffa38  neutron-2014.1.rc1.tar.gz
