[openstack-nova/el6: 7/7] Merge branch 'f16' into el6

[Russell Bryant]

commit 10cc91bc15a828b1b939b5d55af3dfef780ce53c
Merge: 90abae4 5ad0d7b
Author: Russell Bryant <rbryant at redhat.com>
Date:   Thu Mar 29 14:19:21 2012 -0400

    Merge branch 'f16' into el6
    
    Conflicts:
    	openstack-nova-network.service

 ...d-validation-for-OSAPI-server-name-length.patch |   65 ++++++++++++++++++++
 nova-sudoers                                       |    1 +
 openstack-nova.spec                                |   19 ++++++-
 3 files changed, 84 insertions(+), 1 deletions(-)
---
diff --cc openstack-nova.spec
index 4cdb43c,6e86d8c..a23a8ec
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@@ -41,10 -41,8 +41,11 @@@ Patch0008: 0008-Bug-898257-abstract-out
  Patch0009: 0009-Bug-898257-support-handling-images-with-libguestfs.patch
  Patch0010: 0010-Fix-libguestfs-operation-with-specified-partitions.patch
  Patch0011: 0011-Ensure-we-don-t-access-the-net-when-building-docs.patch
+ Patch0012: 0012-Add-validation-for-OSAPI-server-name-length.patch
  
 +# This is EPEL specific and not upstream
 +Patch100:         openstack-nova-newdeps.patch
 +
  BuildArch:        noarch
  BuildRequires:    intltool
  BuildRequires:    python-setuptools
@@@ -57,8 -55,9 +58,10 @@@ Requires:         openstack-glanc
  
  Requires:         python-paste
  Requires:         python-paste-deploy
 +Requires:         python-setuptools
  
+ Requires:         bridge-utils
+ Requires:         dnsmasq-utils
  Requires:         libguestfs-mount >= 1.7.17
  # The fuse dependency should be added to libguestfs-mount
  Requires:         fuse
@@@ -185,10 -185,8 +188,11 @@@ This package contains documentation fil
  %patch0009 -p1
  %patch0010 -p1
  %patch0011 -p1
+ %patch0012 -p1
  
 +# Apply EPEL patch
 +%patch100 -p1
 +
  find . \( -name .gitignore -o -name .placeholder \) -delete
  
  find nova -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;