[openstack-nova/el6-grizzly] Remove the qemu-img-rhev -s option

[Xavier Queralt Mateu]

commit b7cd3535aa92ac258a1e3e954dbacb5e1027865c
Author: Xavier Queralt <xqueralt at redhat.com>
Date:   Tue Dec 3 21:49:47 2013 +0100

    Remove the qemu-img-rhev -s option
    
    In RHEL 6.5 the qemu-img-rhev package is missing the -s option which is
    used by the snapshot code. Thi brings back the behaviour in RHOS 3.0
    where the option was ignored.
    
    Resolves: rhbz#1016896

 0006-remove-the-s-option-on-qemu-img-convert.patch |   48 ++++++++++++++++++++
 openstack-nova.spec                                |    7 +++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/0006-remove-the-s-option-on-qemu-img-convert.patch b/0006-remove-the-s-option-on-qemu-img-convert.patch
new file mode 100644
index 0000000..1b655aa
--- /dev/null
+++ b/0006-remove-the-s-option-on-qemu-img-convert.patch
@@ -0,0 +1,48 @@
+From 141e1eaee9fc9aa8e9cab8f0c707e40ea6b3a979 Mon Sep 17 00:00:00 2001
+From: Vladan Popovic <vpopovic at redhat.com>
+Date: Wed, 9 Oct 2013 15:33:33 +0200
+Subject: [PATCH] remove the -s option on qemu-img convert
+
+In RHEL 6.5 the qemu-img-rhev package is missing the -s option which is
+used by the snapshot code. Thi brings back the behaviour in RHOS 3.0
+where the option was ignored.
+
+Resolves rhbz 1016896
+
+Change-Id: I3b39c0c6b86a0cbba68d98121428707cf31408a6
+Reviewed-on: https://code.engineering.redhat.com/gerrit/14313
+Reviewed-by: Xavier Queralt Mateu <xqueralt at redhat.com>
+Tested-by: Xavier Queralt Mateu <xqueralt at redhat.com>
+---
+ nova/tests/test_libvirt.py | 2 +-
+ nova/virt/libvirt/utils.py | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
+index e422ec7..453684d 100644
+--- a/nova/tests/test_libvirt.py
++++ b/nova/tests/test_libvirt.py
+@@ -4749,7 +4749,7 @@ disk size: 4.4M''', ''))
+     def _do_test_extract_snapshot(self, dest_format='raw', out_format='raw'):
+         self.mox.StubOutWithMock(utils, 'execute')
+         utils.execute('qemu-img', 'convert', '-f', 'qcow2', '-O', out_format,
+-                      '-s', 'snap1', '/path/to/disk/image', '/extracted/snap')
++                      '/path/to/disk/image', '/extracted/snap')
+ 
+         # Start test
+         self.mox.ReplayAll()
+diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py
+index 4c31fcb..fcc07fb 100755
+--- a/nova/virt/libvirt/utils.py
++++ b/nova/virt/libvirt/utils.py
+@@ -505,8 +505,8 @@ def extract_snapshot(disk_path, source_fmt, snapshot_name, out_path, dest_fmt):
+ 
+     # When snapshot name is omitted we do a basic convert, which
+     # is used by live snapshots.
+-    if snapshot_name is not None:
+-        qemu_img_cmd += ('-s', snapshot_name)
++    # if snapshot_name is not None:
++    #     qemu_img_cmd += ('-s', snapshot_name)
+ 
+     qemu_img_cmd += (disk_path, out_path)
+     execute(*qemu_img_cmd)
diff --git a/openstack-nova.spec b/openstack-nova.spec
index eec5848..b86f034 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2013.1.4
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -57,6 +57,7 @@ Patch0002: 0002-avoid-code-path-causing-qpid-exchange-leaks.patch
 Patch0003: 0003-add-conf-for-number-of-conductor-workers.patch
 Patch0004: 0004-Fix-IPAddress-and-CIDR-type-decorators.patch
 Patch0005: 0005-ensure-we-don-t-boot-oversized-images.patch
+Patch0006: 0006-remove-the-s-option-on-qemu-img-convert.patch
 
 # This is EPEL specific and not upstream
 Patch100:         openstack-nova-newdeps.patch
@@ -424,6 +425,7 @@ This package contains documentation files for nova.
 %patch0003 -p1
 %patch0004 -p1
 %patch0005 -p1
+%patch0006 -p1
 
 # Apply EPEL patch
 %patch100 -p1
@@ -873,6 +875,9 @@ fi
 %endif
 
 %changelog
+* Tue Dec 03 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.1.4-4
+- remove the -s option on qemu-img convert - rhbz#1016896
+
 * Tue Dec 03 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.1.4-3
 - Fix the CVE number references from the latest change