[openstack-nova/el6-havana] Update to stable/havana 2013.2.2 release
Xavier Queralt Mateu
xqueralt at fedoraproject.org
Fri Feb 14 11:17:46 UTC 2014
commit 91602474a720fe78e7bd07903fad5f47a55b86d9
Author: Xavier Queralt <xqueralt at redhat.com>
Date: Fri Feb 14 12:14:50 2014 +0100
Update to stable/havana 2013.2.2 release
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 2 +-
0002-remove-runtime-dep-on-python-pbr.patch | 2 +-
...-parallel-install-versions-of-epel-packag.patch | 2 +-
...move-unnecessary-steps-for-cold-snapshots.patch | 16 ++--
0005-libvirt-Fix-root-disk-leak-in-live-mig.patch | 125 --------------------
openstack-nova.spec | 19 ++--
sources | 2 +-
8 files changed, 21 insertions(+), 148 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8397f9e..9207ee9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/nova-2013.2.rc2.tar.gz
/nova-2013.2.tar.gz
/nova-2013.2.1.tar.gz
+/nova-2013.2.2.tar.gz
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index 3499f88..7962086 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From 6a90694b54aa7f2327fec8956e738e652242434d Mon Sep 17 00:00:00 2001
+From 4e1926e728693df88b89b0e0596e72cfed48ffc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 6 Jan 2012 12:16:34 +0000
Subject: [PATCH] Ensure we don't access the net when building docs
diff --git a/0002-remove-runtime-dep-on-python-pbr.patch b/0002-remove-runtime-dep-on-python-pbr.patch
index 4132054..b57fa04 100644
--- a/0002-remove-runtime-dep-on-python-pbr.patch
+++ b/0002-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From a890fb400a5098ce380bf387a782e83cbe857de1 Mon Sep 17 00:00:00 2001
+From 16c21a27c9cbfed0bd04aa62e4e6aecf1f08dc73 Mon Sep 17 00:00:00 2001
From: Nikola Dipanov <ndipanov at redhat.com>
Date: Fri, 14 Jun 2013 11:29:50 +0200
Subject: [PATCH] remove runtime dep on python-pbr
diff --git a/0003-Use-updated-parallel-install-versions-of-epel-packag.patch b/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
index d5b3f34..04f4ff9 100644
--- a/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,4 +1,4 @@
-From 7ac546b1ce85357afecaccbdbdaab7eaeac46787 Mon Sep 17 00:00:00 2001
+From f06ce84717e90187cb45b570db2956c77f40a40a Mon Sep 17 00:00:00 2001
From: Xavier Queralt <xqueralt at redhat.com>
Date: Mon, 16 Dec 2013 12:33:13 +0100
Subject: [PATCH] Use updated parallel install versions of epel package
diff --git a/0004-Remove-unnecessary-steps-for-cold-snapshots.patch b/0004-Remove-unnecessary-steps-for-cold-snapshots.patch
index 20c9255..662e56a 100644
--- a/0004-Remove-unnecessary-steps-for-cold-snapshots.patch
+++ b/0004-Remove-unnecessary-steps-for-cold-snapshots.patch
@@ -1,4 +1,4 @@
-From 1c0ecb318049e451eb8e1f6a012dfd144e51d53a Mon Sep 17 00:00:00 2001
+From 7ba64ec3df7a0792f3bab58c786ea532375b8bd1 Mon Sep 17 00:00:00 2001
From: Vladan Popovic <vpopovic at redhat.com>
Date: Thu, 17 Oct 2013 07:41:20 -0400
Subject: [PATCH] Remove unnecessary steps for cold snapshots
@@ -68,10 +68,10 @@ index 4799837..1872922 100644
diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py
-index 6410be3..358662b 100644
+index dd7bda9..f27d0d0 100644
--- a/nova/tests/virt/libvirt/test_libvirt.py
+++ b/nova/tests/virt/libvirt/test_libvirt.py
-@@ -6262,12 +6262,12 @@ disk size: 4.4M''', ''))
+@@ -6395,12 +6395,12 @@ 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,
@@ -87,10 +87,10 @@ index 6410be3..358662b 100644
def test_extract_snapshot_raw(self):
self._do_test_extract_snapshot()
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
-index 5c05307..077c79b 100644
+index 5043ab3..63a8b1b 100644
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
-@@ -1372,7 +1372,6 @@ class LibvirtDriver(driver.ComputeDriver):
+@@ -1384,7 +1384,6 @@ class LibvirtDriver(driver.ComputeDriver):
virt_dom.managedSave(0)
snapshot_backend = self.image_backend.snapshot(disk_path,
@@ -98,7 +98,7 @@ index 5c05307..077c79b 100644
image_type=source_format)
if live_snapshot:
-@@ -1381,7 +1380,6 @@ class LibvirtDriver(driver.ComputeDriver):
+@@ -1393,7 +1392,6 @@ class LibvirtDriver(driver.ComputeDriver):
else:
LOG.info(_("Beginning cold snapshot process"),
instance=instance)
@@ -106,7 +106,7 @@ index 5c05307..077c79b 100644
update_task_state(task_state=task_states.IMAGE_PENDING_UPLOAD)
snapshot_directory = CONF.libvirt_snapshots_directory
-@@ -1398,8 +1396,6 @@ class LibvirtDriver(driver.ComputeDriver):
+@@ -1409,8 +1407,6 @@ class LibvirtDriver(driver.ComputeDriver):
else:
snapshot_backend.snapshot_extract(out_path, image_format)
finally:
@@ -115,7 +115,7 @@ index 5c05307..077c79b 100644
new_dom = None
# NOTE(dkang): because previous managedSave is not called
# for LXC, _create_domain must not be called.
-@@ -1492,7 +1488,7 @@ class LibvirtDriver(driver.ComputeDriver):
+@@ -1513,7 +1509,7 @@ class LibvirtDriver(driver.ComputeDriver):
# Convert the delta (CoW) image with a backing file to a flat
# image with no backing file.
diff --git a/openstack-nova.spec b/openstack-nova.spec
index c0adf7e..4187d99 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -1,8 +1,8 @@
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-nova
-Version: 2013.2.1
-Release: 3%{?dist}
+Version: 2013.2.2
+Release: 1%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
@@ -50,15 +50,12 @@ Source22: nova-ifc-template
Source30: openstack-nova-novncproxy.sysconfig
#
-# patches_base=2013.2.1
+# patches_base=2013.2.2
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
Patch0003: 0003-Use-updated-parallel-install-versions-of-epel-packag.patch
Patch0004: 0004-Remove-unnecessary-steps-for-cold-snapshots.patch
-Patch0005: 0005-libvirt-Fix-root-disk-leak-in-live-mig.patch
-
-# This is EPEL specific and not upstream
BuildArch: noarch
BuildRequires: intltool
@@ -430,9 +427,6 @@ This package contains documentation files for nova.
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
-%patch0005 -p1
-
-# Apply EPEL patch
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -931,10 +925,13 @@ fi
%endif
%changelog
-* Mon Jan 27 2014 Xavier Queralt <xqueralt@@redhat.com> - 2013.2.1-3
+* Fri Feb 14 2014 Xavier Queralt <xqueralt at redhat.com> - 2013.2.2-1
+- Update to stable/havana 2013.2.2 release
+
+* Mon Jan 27 2014 Xavier Queralt <xqueralt at redhat.com> - 2013.2.1-3
- Fix the patch for CVE-2013-7130 which was not backported properly
-* Fri Jan 24 2014 Xavier Queralt <xqueralt@@redhat.com> - 2013.2.1-2
+* Fri Jan 24 2014 Xavier Queralt <xqueralt at redhat.com> - 2013.2.1-2
- Fix root disk leak in live migration - CVE-2013-7130
* Mon Dec 16 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2.1-1
diff --git a/sources b/sources
index 3dcc9e9..d51c40d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46dfc48b839a7ebbb36a13ef3225fcb9 nova-2013.2.1.tar.gz
+89338b8dc5292f7615e318bde5a89f2e nova-2013.2.2.tar.gz
More information about the scm-commits
mailing list