[openstack-nova] update to Essex release candidate 1
Pádraig Brady
pbrady at fedoraproject.org
Tue Mar 20 13:30:50 UTC 2012
commit 09bb94469be4e9161056fec3f0879e391c5d98e4
Author: Pádraig Brady <P at draigBrady.com>
Date: Tue Mar 20 13:03:34 2012 +0000
update to Essex release candidate 1
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 4 +-
...-interface-drivers-for-the-Linux-Bridge-p.patch | 195 -----------
...0002-fix-useexisting-deprecation-warnings.patch | 2 +-
0003-Adds-soft-reboot-support-to-libvirt.patch | 171 ----------
...tomic-manipulation-of-libvirt-disk-images.patch | 26 +-
...-new-style-config-to-be-used-for-flagfile.patch | 58 ----
...sync_power_states-to-obtain-correct-state.patch | 31 --
0006-nonblocking-libvirt-mode-using-tpool.patch | 80 -----
...-representation-of-ext_srv_attr-extension.patch | 349 --------------------
...Fix-backing-file-cp-resize-race-condition.patch | 67 ----
...ompute-service-to-start-with-missing-libv.patch | 77 -----
openstack-nova.spec | 29 +--
sources | 2 +-
14 files changed, 26 insertions(+), 1066 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da5809c..95745a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/nova-2011.3.1.tar.gz
/nova-2012.1~e3.tar.gz
/nova-2012.1~e4.tar.gz
+/nova-2012.1~rc1.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 71f6bca..e1cb7e9 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 8a88224a8f00d264fd92548d4fe444906b24b47c Mon Sep 17 00:00:00 2001
+From 77af841f5a2e249b4ede21f393b5464b8b750226 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
@@ -11,7 +11,7 @@ Change-Id: I9d02fb4053a8106672aded1614a2850e21603eb2
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 996dfb0..f62ebf8 100644
+index 8ced294..7df59cd 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -25,7 +25,7 @@ sys.path.insert(0, os.path.abspath('./'))
diff --git a/0008-fix-useexisting-deprecation-warnings.patch b/0002-fix-useexisting-deprecation-warnings.patch
similarity index 97%
rename from 0008-fix-useexisting-deprecation-warnings.patch
rename to 0002-fix-useexisting-deprecation-warnings.patch
index b5098ef..806a0ed 100644
--- a/0008-fix-useexisting-deprecation-warnings.patch
+++ b/0002-fix-useexisting-deprecation-warnings.patch
@@ -1,4 +1,4 @@
-From 4cc6c5b4ee74b822ac4ae4b65465435f53289533 Mon Sep 17 00:00:00 2001
+From 6054e7206bea118b400fe2571c8b23888bb6387a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Thu, 8 Mar 2012 16:32:30 +0000
Subject: [PATCH] fix useexisting deprecation warnings
diff --git a/0010-ensure-atomic-manipulation-of-libvirt-disk-images.patch b/0003-ensure-atomic-manipulation-of-libvirt-disk-images.patch
similarity index 91%
rename from 0010-ensure-atomic-manipulation-of-libvirt-disk-images.patch
rename to 0003-ensure-atomic-manipulation-of-libvirt-disk-images.patch
index 3416fd2..14046bd 100644
--- a/0010-ensure-atomic-manipulation-of-libvirt-disk-images.patch
+++ b/0003-ensure-atomic-manipulation-of-libvirt-disk-images.patch
@@ -1,4 +1,4 @@
-From 81ef3436c52f84816a341d19348a464412ce7dc9 Mon Sep 17 00:00:00 2001
+From 0ce9eb5dabd84f7566d54ad5c16b807d73c9274d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
Date: Fri, 16 Mar 2012 03:43:49 +0000
Subject: [PATCH] ensure atomic manipulation of libvirt disk images
@@ -25,7 +25,7 @@ Change-Id: I81a5407665a6998128c0dee41387ef00ebddeb4d
3 files changed, 57 insertions(+), 49 deletions(-)
diff --git a/nova/utils.py b/nova/utils.py
-index a224b38..3ca6aa1 100644
+index ef2b329..6b3ca10 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -21,6 +21,7 @@
@@ -36,7 +36,7 @@ index a224b38..3ca6aa1 100644
import functools
import hashlib
import inspect
-@@ -920,8 +921,8 @@ def cleanup_file_locks():
+@@ -1013,8 +1014,8 @@ def cleanup_file_locks():
continue
try:
stat_info = os.stat(os.path.join(FLAGS.lock_path, filename))
@@ -47,7 +47,7 @@ index a224b38..3ca6aa1 100644
continue
else:
raise
-@@ -940,8 +941,8 @@ def delete_if_exists(pathname):
+@@ -1033,8 +1034,8 @@ def delete_if_exists(pathname):
try:
os.unlink(pathname)
@@ -58,7 +58,7 @@ index a224b38..3ca6aa1 100644
return
else:
raise
-@@ -1247,6 +1248,18 @@ def logging_error(message):
+@@ -1340,6 +1341,18 @@ def logging_error(message):
LOG.exception(message)
@@ -78,10 +78,10 @@ index a224b38..3ca6aa1 100644
"""Return a path to a particular device.
diff --git a/nova/virt/images.py b/nova/virt/images.py
-index 12510c7..4ae47d5 100644
+index 1e0ae0a..2c0b12c 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
-@@ -52,18 +52,10 @@ def fetch(context, image_href, path, _user_id, _project_id):
+@@ -51,18 +51,10 @@ def fetch(context, image_href, path, _user_id, _project_id):
# checked before we got here.
(image_service, image_id) = nova.image.get_image_service(context,
image_href)
@@ -102,7 +102,7 @@ index 12510c7..4ae47d5 100644
def fetch_to_raw(context, image_href, path, user_id, project_id):
-@@ -86,37 +78,36 @@ def fetch_to_raw(context, image_href, path, user_id, project_id):
+@@ -85,37 +77,36 @@ def fetch_to_raw(context, image_href, path, user_id, project_id):
return(data)
@@ -169,10 +169,10 @@ index 12510c7..4ae47d5 100644
return metadata
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
-index 6626ff6..9a8b094 100644
+index 3aabfde..ea94e1e 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
-@@ -998,7 +998,8 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -1028,7 +1028,8 @@ class LibvirtConnection(driver.ComputeDriver):
@utils.synchronized(fname)
def call_if_not_exists(base, fn, *args, **kwargs):
if not os.path.exists(base):
@@ -182,7 +182,7 @@ index 6626ff6..9a8b094 100644
if cow or not generating:
call_if_not_exists(base, fn, *args, **kwargs)
-@@ -1014,8 +1015,9 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -1044,8 +1045,9 @@ class LibvirtConnection(driver.ComputeDriver):
size_gb = size / (1024 * 1024 * 1024)
cow_base += "_%d" % size_gb
if not os.path.exists(cow_base):
@@ -194,7 +194,7 @@ index 6626ff6..9a8b094 100644
libvirt_utils.create_cow_image(cow_base, target)
elif not generating:
libvirt_utils.copy_image(base, target)
-@@ -1025,7 +1027,8 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -1055,7 +1057,8 @@ class LibvirtConnection(driver.ComputeDriver):
if size:
disk.extend(target, size)
@@ -204,7 +204,7 @@ index 6626ff6..9a8b094 100644
@staticmethod
def _create_local(target, local_size, unit='G',
-@@ -1185,8 +1188,9 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -1215,8 +1218,9 @@ class LibvirtConnection(driver.ComputeDriver):
project_id=instance['project_id'],)
elif config_drive:
label = 'config'
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 0016708..118fb2a 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -5,13 +5,13 @@ Version: 2012.1
# The Release is in form 0.X.tag as per:
# http://fedoraproject.org/wiki/Packaging:NamingGuidelines#Pre-Release_packages
# So for prereleases always increment X
-Release: 0.8.e4%{?dist}
+Release: 0.8.rc1%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
License: ASL 2.0
URL: http://openstack.org/projects/compute/
-Source0: http://launchpad.net/nova/essex/essex-4/+download/nova-%{version}~e4.tar.gz
+Source0: http://launchpad.net/nova/essex/essex-rc1/+download/nova-%{version}~rc1.tar.gz
Source1: nova.conf
Source6: nova.logrotate
@@ -32,19 +32,11 @@ Source22: nova-ifc-template
Source23: openstack-nova-db-setup
#
-# patches_base=essex-4
+# patches_base=essex-rc1
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-Add-VIF-and-interface-drivers-for-the-Linux-Bridge-p.patch
-Patch0003: 0003-Adds-soft-reboot-support-to-libvirt.patch
-Patch0004: 0004-Allows-new-style-config-to-be-used-for-flagfile.patch
-Patch0005: 0005-Fix-_sync_power_states-to-obtain-correct-state.patch
-Patch0006: 0006-nonblocking-libvirt-mode-using-tpool.patch
-Patch0007: 0007-Fixes-xml-representation-of-ext_srv_attr-extension.patch
-Patch0008: 0008-fix-useexisting-deprecation-warnings.patch
-Patch0009: 0009-Fix-backing-file-cp-resize-race-condition.patch
-Patch0010: 0010-ensure-atomic-manipulation-of-libvirt-disk-images.patch
-Patch0011: 0011-allow-the-compute-service-to-start-with-missing-libv.patch
+Patch0002: 0002-fix-useexisting-deprecation-warnings.patch
+Patch0003: 0003-ensure-atomic-manipulation-of-libvirt-disk-images.patch
BuildArch: noarch
BuildRequires: intltool
@@ -183,14 +175,6 @@ This package contains documentation files for nova.
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -381,6 +365,9 @@ fi
%endif
%changelog
+* Tue Mar 20 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.9.rc1
+- Update to Essex release candidate 1
+
* Fri Mar 16 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.8.e4
- Include an upstream fix for errors logged when syncing power states
- Support non blocking libvirt operations
diff --git a/sources b/sources
index efab1fc..eaaae2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e7a2a430e0bf8353f93ea4b6e0c2151 nova-2012.1~e4.tar.gz
+0ec5593ed39246b96fa0e5b40e01df89 nova-2012.1~rc1.tar.gz
More information about the scm-commits
mailing list