[openstack-nova/el6-havana] Update to Havana milestone 1
Nikola Dipanov
ndipanov at fedoraproject.org
Mon Jun 10 09:23:58 UTC 2013
commit 53a93938d3b558d97fde209158c1a32dba3af21d
Author: Nikola Dipanov <ndipanov at redhat.com>
Date: Thu Jun 6 21:06:58 2013 +0200
Update to Havana milestone 1
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 2 +-
...COW2-image-size-during-root-disk-creation.patch | 93 ------------------
0002-Remove-a-run-time-dep-on-python-pbr.patch | 101 ++++++++++++++++++++
openstack-nova-newdeps.patch | 27 ++++--
openstack-nova.spec | 19 ++--
sources | 2 +-
7 files changed, 134 insertions(+), 111 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b097cf..8058ed7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
/nova-2013.1.rc2.tar.gz
/nova-2013.1.tar.gz
/nova-2013.1.1.tar.gz
+/nova-2013.2.b1.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 a0a40f5..6266729 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 f4b2590206c9fd3f9c03a2340f5795b7c742688b Mon Sep 17 00:00:00 2001
+From 03b5119fc08fc535fbd8a6a14279033d9547f382 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-a-run-time-dep-on-python-pbr.patch b/0002-Remove-a-run-time-dep-on-python-pbr.patch
new file mode 100644
index 0000000..ac4c614
--- /dev/null
+++ b/0002-Remove-a-run-time-dep-on-python-pbr.patch
@@ -0,0 +1,101 @@
+From 460542f6b383b0f207a951f6c02f77fc1ff8a724 Mon Sep 17 00:00:00 2001
+From: Nikola Dipanov <ndipanov at redhat.com>
+Date: Fri, 7 Jun 2013 16:24:07 +0200
+Subject: [PATCH] Remove a run-time dep on python-pbr
+
+---
+ nova/version.py | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 73 insertions(+), 2 deletions(-)
+
+diff --git a/nova/version.py b/nova/version.py
+index f954ef3..bb25cad 100644
+--- a/nova/version.py
++++ b/nova/version.py
+@@ -14,14 +14,85 @@
+ # License for the specific language governing permissions and limitations
+ # under the License.
+
+-import pbr.version
++import pkg_resources
+
+ NOVA_VENDOR = "OpenStack Foundation"
+ NOVA_PRODUCT = "OpenStack Nova"
+ NOVA_PACKAGE = None # OS distro package version suffix
+
++
++class VersionInfo(object):
++
++ def __init__(self, package):
++ """Object that understands versioning for a package
++ :param package: name of the python package, such as glance, or
++ python-glanceclient
++ """
++ self.package = package
++ self.release = None
++ self.version = None
++ self._cached_version = None
++
++ def __str__(self):
++ """Make the VersionInfo object behave like a string."""
++ return self.version_string()
++
++ def __repr__(self):
++ """Include the name."""
++ return "VersionInfo(%s:%s)" % (self.package, self.version_string())
++
++ def _get_version_from_pkg_resources(self):
++ """Get the version of the package from the pkg_resources record
++ associated with the package.
++ """
++ try:
++ requirement = pkg_resources.Requirement.parse(self.package)
++ provider = pkg_resources.get_provider(requirement)
++ return provider.version
++ except pkg_resources.DistributionNotFound:
++ # The most likely cause for this is running tests in a tree
++ # produced from a tarball where the package itself has not been
++ # installed into anything. Revert to setup-time logic.
++ from pbr import packaging
++ return packaging.get_version(self.package)
++
++ def release_string(self):
++ """Return the full version of the package including suffixes indicating
++ VCS status.
++ """
++ if self.release is None:
++ self.release = self._get_version_from_pkg_resources()
++
++ return self.release
++
++ def version_string(self):
++ """Return the short version minus any alpha/beta tags."""
++ if self.version is None:
++ parts = []
++ for part in self.release_string().split('.'):
++ if part[0].isdigit():
++ parts.append(part)
++ else:
++ break
++ self.version = ".".join(parts)
++
++ return self.version
++
++ def cached_version_string(self, prefix=""):
++ """Generate an object which will expand in a string context to
++ the results of version_string(). We do this so that don't
++ call into pkg_resources every time we start up a program when
++ passing version information into the CONF constructor, but
++ rather only do the calculation when and if a version is requested
++ """
++ if not self._cached_version:
++ self._cached_version = "%s%s" % (prefix,
++ self.version_string())
++ return self._cached_version
++
++
+ loaded = False
+-version_info = pbr.version.VersionInfo('nova')
++version_info = VersionInfo('nova')
+ version_string = version_info.version_string
+
+
diff --git a/openstack-nova-newdeps.patch b/openstack-nova-newdeps.patch
index 916cd60..c111252 100644
--- a/openstack-nova-newdeps.patch
+++ b/openstack-nova-newdeps.patch
@@ -1,11 +1,23 @@
+From 17ce490483d8da9cb2ff859c07ff88f809e335d3 Mon Sep 17 00:00:00 2001
+From: Nikola Dipanov <ndipanov at redhat.com>
+Date: Mon, 10 Jun 2013 10:24:55 +0200
+Subject: [PATCH] openstack-nova-new-deps
+
+Change-Id: I06793fee68ef2847899aa712d3f10aa2fd3887e9
+---
+ nova/__init__.py | 30 ++++++++++++++++++++++++++++++
+ nova/db/sqlalchemy/migration.py | 8 +++++++-
+ 2 files changed, 37 insertions(+), 1 deletion(-)
+
diff --git a/nova/__init__.py b/nova/__init__.py
-index a9eca48..9bf9c4d 100644
+index e21bdd7..ee3e322 100644
--- a/nova/__init__.py
+++ b/nova/__init__.py
-@@ -24,6 +24,36 @@
+@@ -24,3 +24,33 @@
:platform: Unix
:synopsis: Infrastructure-as-a-Service Cloud platform.
"""
++
+import sys
+import pkg_resources
+
@@ -35,15 +47,11 @@ index a9eca48..9bf9c4d 100644
+# TODO: See can we get pkg_resources to do the right thing directly
+import paste
+paste.__path__.insert(0, paste.__path__.pop(-1))
-+
-
- import gettext
-
diff --git a/nova/db/sqlalchemy/migration.py b/nova/db/sqlalchemy/migration.py
-index dbc1ed4..0260be0 100644
+index 14758ab..a9727e3 100644
--- a/nova/db/sqlalchemy/migration.py
+++ b/nova/db/sqlalchemy/migration.py
-@@ -56,7 +56,13 @@ if (not hasattr(migrate, '__version__') or
+@@ -52,7 +52,13 @@ if (not hasattr(migrate, '__version__') or
# NOTE(jkoelker) Delay importing migrate until we are patched
@@ -58,3 +66,6 @@ index dbc1ed4..0260be0 100644
from migrate.versioning import api as versioning_api
from migrate.versioning.repository import Repository
+--
+1.7.9.5
+
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 1ba5323..ab6fce7 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -1,14 +1,14 @@
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-nova
-Version: 2013.1.1
-Release: 3%{?dist}
+Version: 2013.2
+Release: 0.1.h1%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
License: ASL 2.0
URL: http://openstack.org/projects/compute/
-Source0: https://launchpad.net/nova/grizzly/2013.1/+download/nova-%{version}.tar.gz
+Source0: https://launchpad.net/nova/havana/havana-1/+download/nova-%{version}.b1.tar.gz
Source1: nova.conf
Source6: nova.logrotate
@@ -45,10 +45,10 @@ Source21: nova-polkit.pkla
Source22: nova-ifc-template
#
-# patches_base=2013.1.1
+# patches_base=2013.2.b1
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
-Patch0002: 0002-Check-QCOW2-image-size-during-root-disk-creation.patch
+Patch0002: 0002-Remove-a-run-time-dep-on-python-pbr.patch
# This is EPEL specific and not upstream
Patch100: openstack-nova-newdeps.patch
@@ -59,6 +59,8 @@ BuildRequires: python-sphinx10
BuildRequires: python-setuptools
BuildRequires: python-netaddr
BuildRequires: openstack-utils
+BuildRequires: python-pbr
+BuildRequires: python-d2to1
# These are required to build due to the requirements check added
BuildRequires: python-paste-deploy1.5
BuildRequires: python-routes1.12
@@ -384,7 +386,7 @@ This package contains documentation files for nova.
%endif
%prep
-%setup -q -n nova-%{version}
+%setup -q -n nova-%{version}.b1
%patch0001 -p1
%patch0002 -p1
@@ -398,8 +400,6 @@ find nova -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +
sed -i '/setuptools_git/d' setup.py
-sed -i s/LOCALBRANCH:LOCALREVISION/%{release}/ nova/version.py
-
%build
%{__python} setup.py build
@@ -814,6 +814,9 @@ fi
%endif
%changelog
+* Fri Jun 7 2013 Nikola Đipanov <ndipanov at redhat.com> - 2013.2-0.1.h1
+- Update to Havana milestone 1
+
* Fri May 31 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1.1-3
- Depend on dnsmasq-utils to give direct control over dnsmasq leases
diff --git a/sources b/sources
index aada8c0..7ce661a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13636df2a0e357237791e1a2153b91c4 nova-2013.1.1.tar.gz
+e3e5e75c50ac44a48f8f233d2d025389 nova-2013.2.b1.tar.gz
More information about the scm-commits
mailing list