[openstack-neutron] Add rootwrap.conf limitation to sudoers.d/neutron

[Terry Wilson]

commit 0eb2cefa1a1163b02841ce1f4266bec46fb9bc98
Author: Terry Wilson <twilson at redhat.com>
Date:   Thu Dec 12 17:14:25 2013 -0600

    Add rootwrap.conf limitation to sudoers.d/neutron

 neutron-sudoers        |    2 +-
 openstack-neutron.spec |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/neutron-sudoers b/neutron-sudoers
index 3786ada..b5448c8 100644
--- a/neutron-sudoers
+++ b/neutron-sudoers
@@ -1,3 +1,3 @@
 Defaults:neutron !requiretty
 
-neutron ALL = (root) NOPASSWD: SETENV: /usr/bin/neutron-rootwrap
+neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf *
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index 7a9e7dd..85edec6 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2013.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.4.b3
 Summary:	OpenStack Networking Service
@@ -916,6 +916,10 @@ fi
 
 
 %changelog
+* Tue Dec 10 2013 Terry Wilson <twilson at redhat.com> - 2013.2-6
+- Add rootwrap.conf limitation to sudoers.d/neutron, bz#984097
+- neutron-server-setup: support mariadb
+
 * Wed Dec 04 2013 Terry Wilson <twilson at redhat.com> - 2013.2-5
 - Add missing debug and vpnaas rootwrap filters, bz#1034207