[openstack-neutron/el6-icehouse] Update to icehouse milestone 2

[Terry Wilson]

commit 2e12a4a294b97cbebd47ed37d5debf59dc9fed25
Author: Terry Wilson <twilson at redhat.com>
Date:   Mon Jan 27 17:52:27 2014 -0600

    Update to icehouse milestone 2

 .gitignore             |    1 +
 openstack-neutron.spec |   29 +++++++++++++++++++++++++----
 sources                |    2 +-
 3 files changed, 27 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e0ec69..54017ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /neutron-2013.2.tar.gz
 /neutron-2013.2.1.tar.gz
 /neutron-2014.1.b1.tar.gz
+/neutron-2014.1.b2.tar.gz
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 515716d..861cf2e 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1
-Release:	0.2.b1%{?dist}
+Release:	0.3.b2%{?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}.b1.tar.gz
+Source0:	http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.b2.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.b1+1
+# patches_base=2014.1.b2+1
 #
 Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
 Patch0002: 0002-Add-fwaas_driver.ini-to-setup.cfg.patch
@@ -404,6 +404,17 @@ Neutron provides an API to measure bandwidth utilization
 This package contains the neutron agent responsible for generating bandwidth
 utilization notifications.
 
+
+%package -n openstack-neutron-vmware-nsx
+Summary:       Neutron VMWare NSX support
+Group:         Applications/System
+
+Requires:      openstack-neutron = %{version}-%{release}
+
+%description -n openstack-neutron-vmware-nsx
+This package adds VMWare NSX support for neutron
+
+
 %package -n openstack-neutron-vpn-agent
 Summary:	Neutron VPNaaS agent
 Group:		Applications/System
@@ -418,7 +429,7 @@ IPSec.
 
 
 %prep
-%setup -q -n neutron-%{version}.b1
+%setup -q -n neutron-%{version}.b2
 
 %patch0001 -p1
 %patch0002 -p1
@@ -995,6 +1006,13 @@ fi
 %{_bindir}/neutron-metering-agent
 
 
+%files -n openstack-neutron-vmware-nsx
+%doc LICENSE
+%{_bindir}/neutron-check-nsx-config
+%dir %{_sysconfdir}/neutron/plugins/vmware
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/plugins/vmware/*.ini
+
+
 %files -n openstack-neutron-vpn-agent
 %doc LICENSE
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/vpn_agent.ini
@@ -1005,6 +1023,9 @@ fi
 
 
 %changelog
+* Mon Jan 27 2014 Terry Wilson <twilson at redhat.com> - 2014.1.b2-3
+- Update to icehouse milestone 2
+
 * Tue Jan 07 2014 Terry Wilson <twilson at redhat.com> - 2014.1.b1-2
 - Add python-psutil requirement for openvswitch agent, bz#1049235
 
diff --git a/sources b/sources
index 0afe5c2..1423194 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fd9f56ff85f22ff2467c880ebf5337b8  neutron-2014.1.b1.tar.gz
+c7f6e34ddc6c4ae49c0d3a63fa432bae  neutron-2014.1.b2.tar.gz