[openstack-nova/el6-icehouse: 6/6] Update to Icehouse milestone 1
Xavier Queralt Mateu
xqueralt at fedoraproject.org
Mon Dec 16 16:28:35 UTC 2013
commit 488a38a61c1d718e3ca1e7e3f84a13ad8b86fdfe
Author: Xavier Queralt <xqueralt at redhat.com>
Date: Mon Dec 16 12:29:47 2013 +0100
Update to Icehouse milestone 1
.gitignore | 1 +
...e-don-t-access-the-net-when-building-docs.patch | 2 +-
0002-remove-runtime-dep-on-python-pbr.patch | 2 +-
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 1336 --------------------
...-parallel-install-versions-of-epel-packag.patch | 51 +
...ass-volume_api-to-get_encryption_metadata.patch | 113 --
0005-remove-the-s-option-on-qemu-img-convert.patch | 45 -
0006-ensure-we-don-t-boot-oversized-images.patch | 451 -------
openstack-nova.spec | 43 +-
sources | 2 +-
10 files changed, 75 insertions(+), 1971 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 441ce36..2c47572 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/nova-2013.2.rc1.tar.gz
/nova-2013.2.rc2.tar.gz
/nova-2013.2.tar.gz
+/nova-2014.1.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 6d0026d..3ccba55 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 7e9809c1d7ffbf3610b64dfeccb6484f79476884 Mon Sep 17 00:00:00 2001
+From 408ff3f40f27ef80c0be889bb799ee64122572b9 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 4bf5fca..61f69eb 100644
--- a/0002-remove-runtime-dep-on-python-pbr.patch
+++ b/0002-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 6752d363a16a3eee4a8f90938f031bf6d599dce2 Mon Sep 17 00:00:00 2001
+From c2234c879aaa9dfd3153f369c74ddcae623f030a 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
new file mode 100644
index 0000000..5c56286
--- /dev/null
+++ b/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -0,0 +1,51 @@
+From c3a4968f03462e0ac3c61ed2e2e7d42194b76bb7 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
+
+Use SQLAlchemy >= 0.7.8 WebOb >= 1.2 Routes >= 1.12.3 PasteDeploy >= 1.5.0
+and depend on the parallel installable versions of these packages to satisfy
+those requirements.
+---
+ nova/__init__.py | 31 +++++++++++++++++++++++++++++++
+ 1 file changed, 31 insertions(+)
+
+diff --git a/nova/__init__.py b/nova/__init__.py
+index e21bdd7..992d6de 100644
+--- a/nova/__init__.py
++++ b/nova/__init__.py
+@@ -24,3 +24,34 @@
+ :platform: Unix
+ :synopsis: Infrastructure-as-a-Service Cloud platform.
+ """
++
++import sys
++import pkg_resources
++
++# If there is a conflicting non egg module,
++# i.e. an older standard system module installed,
++# then replace it with this requirement
++def replace_dist(requirement):
++ try:
++ return pkg_resources.require(requirement)
++ except pkg_resources.VersionConflict:
++ e = sys.exc_info()[1]
++ dist=e.args[0]
++ req=e.args[1]
++ if dist.key == req.key and not dist.location.endswith('.egg'):
++ del pkg_resources.working_set.by_key[dist.key]
++ # We assume there is no need to adjust sys.path
++ # and the associated pkg_resources.working_set.entries
++ return pkg_resources.require(requirement)
++
++replace_dist("WebOb >= 1.2")
++replace_dist("SQLAlchemy >= 0.7.8")
++replace_dist("Routes >= 1.12.3")
++replace_dist("Jinja2 >= 2.6")
++
++replace_dist("PasteDeploy >= 1.5.0")
++# This hack is needed because replace_dist() results in
++# the standard paste module path being at the start of __path__.
++# TODO: See can we get pkg_resources to do the right thing directly
++import paste
++paste.__path__.insert(0, paste.__path__.pop(-1))
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 3826add..7906ace 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.2
-Release: 5%{?dist}
+Version: 2014.1
+Release: 0.1.b1%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
License: ASL 2.0
URL: http://openstack.org/projects/compute/
-Source0: https://launchpad.net/nova/havana/%{version}/+download/nova-%{version}.tar.gz
+Source0: https://launchpad.net/nova/icehouse/icehouse-1/+download/nova-%{version}.b1.tar.gz
Source1: nova-dist.conf
Source6: nova.logrotate
@@ -50,21 +50,18 @@ Source22: nova-ifc-template
Source30: openstack-nova-novncproxy.sysconfig
#
-# patches_base=2013.2
+# patches_base=2014.1.b1
#
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-remove-runtime-dep-on-python-pbr.patch
-Patch0003: 0003-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
-Patch0004: 0004-Pass-volume_api-to-get_encryption_metadata.patch
-Patch0005: 0005-remove-the-s-option-on-qemu-img-convert.patch
-Patch0006: 0006-ensure-we-don-t-boot-oversized-images.patch
+Patch0003: 0003-Use-updated-parallel-install-versions-of-epel-packag.patch
# This is EPEL specific and not upstream
-Patch100: openstack-nova-newdeps.patch
BuildArch: noarch
BuildRequires: intltool
BuildRequires: python-sphinx10
+BuildRequires: python-oslo-sphinx
BuildRequires: python-setuptools
BuildRequires: python-netaddr
BuildRequires: openstack-utils
@@ -425,17 +422,13 @@ This package contains documentation files for nova.
%endif
%prep
-%setup -q -n nova-%{version}
+%setup -q -n nova-%{version}.b1
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
# Apply EPEL patch
-%patch100 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -934,10 +927,14 @@ fi
%endif
%changelog
+* Mon Dec 16 2013 Xavier Queralt <xqueralt at redhat.com> - 2014.1-0.1.b1
+- Update to Icehouse milestone 1
+- Add python-oslo-sphinx to build requirements
+
* Tue Dec 03 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-5
- Fix the CVE number references from the latest change
-* Tue Nov 18 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-4
+* Mon Nov 18 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-4
- Remove cert and scheduler hard dependency on cinderclient - rhbz#1031679
- Require ipmitool for baremetal driver - rhbz#1022243
- Ensure we don't boot oversized images (CVE-2013-4463 and CVE-2013-2096)
@@ -1004,7 +1001,7 @@ fi
* Wed Aug 07 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.9.b2
- Create a nova-dist.conf file with default values under /usr/share
-* Sun Jul 22 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.8.b2
+* Mon Jul 22 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.8.b2
- Update to Havana milestone 2
* Wed Jul 17 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-0.6.b1
@@ -1092,7 +1089,7 @@ fi
* Tue Oct 30 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-2
- Add support for python-migrate-0.6
-* Thu Oct 12 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-1
+* Fri Oct 12 2012 Pádraig Brady <pbrady at redhat.com> - 2012.2-1
- Update to folsom final
* Fri Oct 12 2012 Nikola Dipanov <ndipanov at redhat.com> - 2012.1.3-1
@@ -1119,7 +1116,7 @@ fi
* Mon Aug 6 2012 Pádraig Brady <P at draigBrady.com> - 2012.1.1-12
- Fix group installation issue introduced in 2012.1.1-10
-* Sun Jul 30 2012 Pádraig Brady <P at draigBrady.com> - 2012.1.1-11
+* Mon Jul 30 2012 Pádraig Brady <P at draigBrady.com> - 2012.1.1-11
- Update from stable upstream including...
- Fix metadata file injection with xen
- Fix affinity filters when hints is None
@@ -1176,7 +1173,7 @@ fi
- fix the encoding of the dns_domains table (requires a db sync)
- fix a crash due to a nova services startup race (#825051)
-* Wed Jun 08 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-10
+* Fri Jun 08 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-10
- Enable libguestfs image inspection
* Wed Jun 06 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-9
@@ -1198,7 +1195,7 @@ fi
* Tue May 01 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-5
- Start the services later in the boot sequence
-* Wed Apr 27 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-4
+* Fri Apr 27 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-4
- Fix install issues with new Essex init scripts
* Wed Apr 25 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-3
@@ -1214,7 +1211,7 @@ fi
* Fri Apr 13 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-1
- Update to Essex release
-* Mon Apr 01 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.1.rc1
+* Sun Apr 01 2012 Pádraig Brady <P at draigBrady.com> - 2012.1-0.1.rc1
- Update to Essex release candidate 1
* Thu Mar 29 2012 Pádraig Brady <P at draigBrady.com> - 2011.3.1-8
@@ -1224,7 +1221,7 @@ fi
- CVE-2012-1585 - Long server names grow nova-api log files significantly
- Resolves: rhbz#808148
-* Mon Mar 6 2012 Pádraig Brady <P at draigBrady.com> - 2011.3.1-5
+* Tue Mar 06 2012 Pádraig Brady <P at draigBrady.com> - 2011.3.1-5
- Require bridge-utils
* Mon Feb 13 2012 Pádraig Brady <P at draigBrady.com> - 2011.3.1-4
@@ -1275,7 +1272,7 @@ fi
- Don't require the fuse group (#770927)
- Require the fuse package (to avoid #767852)
-* Tue Dec 14 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-13
+* Wed Dec 14 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-13
- Sanitize EC2 manifests and image tarballs (#767236, CVE 2011-4596)
- update libguestfs support
diff --git a/sources b/sources
index ff81a20..e68993e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dec2a8321504922a1beb8c4188c4e78c nova-2013.2.tar.gz
+51afb966884fa690db567600453a2131 nova-2014.1.b1.tar.gz
More information about the scm-commits
mailing list