X-Git-Url: https://review.fuel-infra.org/gitweb?p=openstack-build%2Fneutron-build.git;a=blobdiff_plain;f=rpm%2FSPECS%2Fopenstack-neutron.spec;fp=rpm%2FSPECS%2Fopenstack-neutron.spec;h=23fff013847863de4bfa36866bafd9c440be195d;hp=994f5abbf5065f19456463285feb688b40728ca4;hb=4cca60531b51db68e6023ea6daa60cc33d277826;hpb=3dea7869947d652cb9d069c3b9fcbd3f4c32ec3b

diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec
index 994f5abbf..23fff0138 100644
--- a/rpm/SPECS/openstack-neutron.spec
+++ b/rpm/SPECS/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1
-Release:	0.7.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,7 +50,7 @@ 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
@@ -334,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
@@ -343,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
@@ -886,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
@@ -900,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
@@ -984,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
@@ -1074,6 +1101,13 @@ fi
 
 
 %changelog
+* Wed Apr 02 2014 Terry Wilson <twilson@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@redhat.com> - 2014.1.b3-8
+- Create agents table when ML2 core_plugin is used
+ 
 * 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