Hello community, here is the log from the commit of package openstack-nova for openSUSE:Factory checked in at 2014-01-20 07:27:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openstack-nova (Old) and /work/SRC/openSUSE:Factory/.openstack-nova.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-nova" Changes: -------- --- /work/SRC/openSUSE:Factory/openstack-nova/openstack-nova.changes 2013-11-20 11:06:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.openstack-nova.new/openstack-nova.changes 2014-01-23 15:50:42.000000000 +0100 @@ -1,0 +2,149 @@ +Fri Jan 10 20:45:42 UTC 2014 - [email protected] + +- set default keystone signing dir + +------------------------------------------------------------------- +Fri Jan 10 14:49:28 UTC 2014 - [email protected] + +- add 0001-Further-harden-boto-version-checking-in-EC2-tests.patch +- remove 0001-Harden-version-checking-for-boto.patch + +------------------------------------------------------------------- +Mon Jan 6 12:21:58 UTC 2014 - [email protected] + +- Add neutron-performance.patch: backport of several patches to + improve performance when interacting with neutron. + +------------------------------------------------------------------- +Thu Jan 2 18:38:36 UTC 2014 - [email protected] + +- Update to version 2013.2.2.dev15.ge7b2e3a+git.1388687916.e7b2e3a: + + Add context as parameter for resume + + Fix migration 185 to work with old fkey names + +------------------------------------------------------------------- +Sat Dec 21 00:45:26 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev11.g6ad8842+git.1387586726.6ad8842: + + Allow compute manager to accept 3.0 messages + + Allow resizes and migrates during live upgrade + +------------------------------------------------------------------- +Thu Dec 19 01:23:10 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev7.g1379f65+git.1387416190.1379f65: + + Make Serializer able to backlevel objects + + use 'os_type' in ephemeral filename only if mkfs defined + +------------------------------------------------------------------- +Wed Dec 18 00:52:00 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev3.g251a940+git.1387327920.251a940: + + Include image block device maps in info + +------------------------------------------------------------------- +Tue Dec 17 01:05:32 UTC 2013 - [email protected] + +- Update to version 2013.2.2.dev1.gafc9e4e+git.1387242332.afc9e4e: + + Bump stable/havana next version to 2013.2.2 + +------------------------------------------------------------------- +Mon Dec 16 09:30:24 UTC 2013 - [email protected] + +- fix requires + +------------------------------------------------------------------- +Sun Dec 15 01:15:12 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev84.ga4ffc06+git.1387070112.a4ffc06: + + Prevent spoofing instance_id from neutron to nova + +------------------------------------------------------------------- +Sat Dec 14 00:38:06 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev82.ge5cb2de+git.1386981486.e5cb2de: + + Updated from global requirements + +------------------------------------------------------------------- +Wed Dec 11 01:42:08 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev81.g5a9551d+git.1386726128.5a9551d: + + Prevent rescheduling on block device failure + +------------------------------------------------------------------- +Tue Dec 10 00:49:15 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev79.g14baf9a+git.1386636555.14baf9a: + + Process image BDM earlier to avoid duplicates + +------------------------------------------------------------------- +Mon Dec 9 15:22:12 UTC 2013 - [email protected] + +- Only require dnsmasq-utils on 13.1 or later, 12.3 doesn't yet have + the sub-package + +------------------------------------------------------------------- +Mon Dec 9 10:05:51 UTC 2013 - [email protected] + +- Add dnsmasq-utils nova-network dependency for openSUSE (it provides + dhcp release). This package is not available for SLES yet. + +------------------------------------------------------------------- +Sun Dec 8 01:26:59 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev77.gb78f90f+git.1386466019.b78f90f: + + Sync local from oslo. + + VMware: fix snapshot failure when host in maintenance mode + + Sync rpc fix from oslo-incubator + + Clean BDM when snapshoting volume-backed instances + + VMware: Fix unhandled session failure issues + +------------------------------------------------------------------- +Sat Dec 7 01:10:59 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev67.g8f007df+git.1386378659.8f007df: + + Avoid clobbering {system_,}metadata dicts passed to instance update + + Require python-cinderclient >= 1.0.6 + + Fix OLE error for HyperV + + Fix libvirt evacuate instance on shared storage fails + + Fix up spelling mistake + + Moved quota headroom calculations into quota_reserve + + VMware: fix VM resize bug + +------------------------------------------------------------------- +Thu Dec 5 16:35:59 UTC 2013 - [email protected] + +- add 0001-Setup-destination-disk-from-virt_disk_size.patch (bnc#852603) + +------------------------------------------------------------------- +Tue Dec 3 09:04:03 UTC 2013 - [email protected] + +- add 0001-Harden-version-checking-for-boto.patch + +------------------------------------------------------------------- +Tue Dec 3 01:31:08 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev53.g8affa07+git.1386034268.8affa07: + + Add missing argument max_size in libvirt driver + +------------------------------------------------------------------- +Thu Nov 28 00:43:22 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev51.g8a99344+git.1385599402.8a99344: + + Check for None when cleaning PCI dev usage + + Pass volume_api to get_encryption_metadata + + VMware: Handle cases when there are no hosts in cluster + + VMware: Detach volume should not delete vmdk + +------------------------------------------------------------------- +Wed Nov 27 00:54:51 UTC 2013 - [email protected] + +- Update to version 2013.2.1.dev43.gef9aec1+git.1385513691.ef9aec1: + + Address infinite loop in nova compute when getting network info + +------------------------------------------------------------------- +Wed Nov 20 12:36:14 UTC 2013 - [email protected] + +- Add nova-vmware-hypervisor-version.patch + +------------------------------------------------------------------- New: ---- 0001-Further-harden-boto-version-checking-in-EC2-tests.patch 0001-Setup-destination-disk-from-virt_disk_size.patch neutron-performance.patch nova-vmware-hypervisor-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openstack-nova-doc.spec ++++++ --- /var/tmp/diff_new_pack.xI3Vso/_old 2014-01-23 15:50:44.000000000 +0100 +++ /var/tmp/diff_new_pack.xI3Vso/_new 2014-01-23 15:50:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openstack-nova-doc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define majorversion 2012.2.3 Name: openstack-%{component}-doc -Version: 2013.2.1.dev42.gf7cfc1c+git.1384771045.f7cfc1c +Version: 2013.2.2.dev15.ge7b2e3a+git.1388687916.e7b2e3a Release: 0 Summary: OpenStack Compute (Nova) - Documentation License: Apache-2.0 @@ -60,7 +60,7 @@ This package contains documentation files for openstack-nova. %prep -%setup -q -n nova-2013.2.1.dev42.gf7cfc1c +%setup -q -n nova-2013.2.2.dev15.ge7b2e3a %openstack_cleanup_prep %build ++++++ openstack-nova.spec ++++++ --- /var/tmp/diff_new_pack.xI3Vso/_old 2014-01-23 15:50:44.000000000 +0100 +++ /var/tmp/diff_new_pack.xI3Vso/_new 2014-01-23 15:50:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package openstack-nova # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 B1 Systems GmbH, Vohburg, Germany. # # All modifications and additions to the file contributed by third parties @@ -22,7 +22,7 @@ %define username openstack-%{component} Name: openstack-%{component} -Version: 2013.2.1.dev42.gf7cfc1c+git.1384771045.f7cfc1c +Version: 2013.2.2.dev15.ge7b2e3a+git.1388687916.e7b2e3a Release: 0 Summary: OpenStack Compute (Nova) License: Apache-2.0 @@ -50,12 +50,17 @@ Patch8: suse-cleanup-api-paste.diff Patch9: 0001-Robustify-determination-of-root-directory.patch Patch10: 0001-Claim-IPv6-is-unsupported-if-no-interface-with-IPv6-.patch +# https://review.openstack.org/#/c/34685 +Patch11: nova-vmware-hypervisor-version.patch +Patch12: 0001-Further-harden-boto-version-checking-in-EC2-tests.patch +Patch13: 0001-Setup-destination-disk-from-virt_disk_size.patch +# Backports of several patches: https://review.openstack.org/#/c/52954/ https://review.openstack.org/#/c/56075/ https://review.openstack.org/#/c/56174/ https://review.openstack.org/#/c/59243/ +Patch30: neutron-performance.patch BuildRequires: crudini BuildRequires: fdupes BuildRequires: openstack-suse-macros BuildRequires: openstack-suse-sudo BuildRequires: python-base -BuildRequires: python-d2to1 BuildRequires: python-distribute BuildRequires: python-oslo.config BuildRequires: python-oslo.sphinx @@ -100,7 +105,7 @@ Group: Development/Languages/Python Conflicts: pyxml < 0.8.5 Requires: python >= 2.6.8 -Requires: python-Babel >= 0.9.6 +Requires: python-Babel >= 1.3 Requires: python-Jinja2 Requires: python-Paste Requires: python-PasteDeploy >= 1.5.0 @@ -112,12 +117,11 @@ Requires: python-anyjson >= 0.3.3 Requires: python-argparse Requires: python-boto >= 2.4.0 -Requires: python-cinderclient >= 1.0.5 -Requires: python-d2to1 >= 0.2.10 +Requires: python-cinderclient >= 1.0.6 Requires: python-eventlet >= 0.13.0 Requires: python-glanceclient >= 0.9.0 Requires: python-greenlet >= 0.3.2 -Requires: python-iso8601 >= 0.1.4 +Requires: python-iso8601 >= 0.1.8 Requires: python-jsonschema >= 1.3.0 Requires: python-keystoneclient >= 0.3.2 Requires: python-kombu >= 2.4.8 @@ -127,7 +131,7 @@ Requires: python-paramiko >= 1.8.0 Requires: python-pbr >= 0.5.21 Requires: python-pyasn1 -Requires: python-six +Requires: python-six >= 1.4.1 Requires: python-sqlalchemy-migrate >= 0.7.2 Requires: python-stevedore >= 0.10 Requires: python-suds >= 0.4 @@ -212,6 +216,9 @@ Group: System/Management Requires: %{name} = %{version} Requires: dnsmasq +%if 0%{?suse_version} > 1230 +Requires: dnsmasq-utils +%endif Requires: iptables %description network @@ -263,7 +270,7 @@ Group: System/Management Requires: %{name} = %{version} Requires: curl -Requires: python-cinderclient >= 1.0.5 +Requires: python-cinderclient >= 1.0.6 Requires: python-coverage >= 3.6 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-discover @@ -272,6 +279,7 @@ Requires: python-fixtures >= 0.3.14 Requires: python-flake8 >= 2.0 Requires: python-hacking >= 0.5.6 +Requires: python-mock >= 1.0 Requires: python-mox >= 0.5.3 Requires: python-pep8 >= 1.4.5 Requires: python-psycopg2 @@ -285,13 +293,17 @@ OpenStack Nova and its components. %prep -%setup -q -n nova-2013.2.1.dev42.gf7cfc1c +%setup -q -n nova-2013.2.2.dev15.ge7b2e3a %patch1 -p1 %patch2 -p1 %patch7 -p1 %patch8 %patch9 -p1 %patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch30 -p1 %openstack_cleanup_prep %build @@ -311,6 +323,7 @@ install -d -m 755 %{buildroot}%{_localstatedir}/lock/nova install -d -m 755 %{buildroot}%{_localstatedir}/log/nova install -d -m 755 %{buildroot}%{_localstatedir}/run/nova +install -d -m 700 %{buildroot}%{_localstatedir}/cache/nova ### configuration files install -p -D -m 600 etc/nova/nova.conf.sample %{buildroot}%{_sysconfdir}/nova/nova.conf @@ -392,10 +405,7 @@ crudini --set %{nova_conf} DEFAULT security_group_api neutron #NOTE(saschpe): Do we want to use sqlite per default or demand PostgreSQL right away? crudini --set %{nova_conf} sql connection sqlite:////var/lib/nova/nova.db - -### authentication cache dir -mkdir -p %{buildroot}%{_localstatedir}/cache/nova/api -sed -s "s,\(signing_dir =\).*,\1 /var/cache/glance/api," %{buildroot}%{_sysconfdir}/nova/api-paste.ini +crudini --set %{nova_conf} keystone_authtoken signing_dir /var/cache/%component/keystone-signing %pre # need a fixed uid/gid for being able to use shared storage over NFS ++++++ 0001-Further-harden-boto-version-checking-in-EC2-tests.patch ++++++ >From 35a50cf5e6ba13d43e6f954db0b1d6c41b48d874 Mon Sep 17 00:00:00 2001 From: Adam Gandelman <[email protected]> Date: Mon, 14 Oct 2013 18:01:15 -0700 Subject: [PATCH] Further harden boto version checking in EC2 tests Use pkg_resources to determine correct boto interface to use in API tests. stable/havana version. Fixes Bug #1239220 Rebased-By: Dirk Mueller <[email protected]> Change-Id: I455ce5f2aabfad7178be361844c6b9b7b0d9c946 --- nova/tests/api/ec2/test_api.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nova/tests/api/ec2/test_api.py b/nova/tests/api/ec2/test_api.py index 0acea1f..0cb9220 100644 --- a/nova/tests/api/ec2/test_api.py +++ b/nova/tests/api/ec2/test_api.py @@ -18,6 +18,7 @@ """Unit tests for the API endpoint.""" +import pkg_resources import random import re import StringIO @@ -272,10 +273,11 @@ class ApiEc2TestCase(test.TestCase): self.http = FakeHttplibConnection( self.app, '%s:8773' % (self.host), False) # pylint: disable=E1103 - if boto.Version >= '2.14': + boto_version = pkg_resources.parse_version(boto.Version) + if boto_version >= pkg_resources.parse_version('2.14'): self.ec2.new_http_connection(host or self.host, 8773, is_secure).AndReturn(self.http) - elif boto.Version >= '2': + elif boto_version >= pkg_resources.parse_version('2'): self.ec2.new_http_connection(host or '%s:8773' % (self.host), is_secure).AndReturn(self.http) else: -- 1.8.4.1 ++++++ 0001-Setup-destination-disk-from-virt_disk_size.patch ++++++ >From c61c67c5afd100749b7b55b251bd4e4e3bb556a2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller <[email protected]> Date: Tue, 3 Dec 2013 17:16:58 +0100 Subject: [PATCH] Setup destination disk from virt_disk_size When running live-migration --block-migrate on a qcow2 backed VM without cow image, the destination qcow2 file should be created with the virtual disk size. For raw images, the virt_disk_size is set to disk_size to ensure that virt_disk_size is always the size of the disk that should be re-created. Update unit tests to be more strict and check for sizes to be correct. Closes-Bug: #1257355 Change-Id: Ie3be46024f06b9f59af92f5e3918a1958386d4f1 --- nova/tests/virt/libvirt/test_libvirt.py | 22 +++++++++++++++------- nova/virt/libvirt/driver.py | 4 ++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py index 5aa83fa..f8babf2 100644 --- a/nova/tests/virt/libvirt/test_libvirt.py +++ b/nova/tests/virt/libvirt/test_libvirt.py @@ -3155,24 +3155,32 @@ class LibvirtConnTestCase(test.TestCase): db.instance_destroy(self.context, instance_ref['uuid']) - def test_create_images_and_backing(self): + def _do_test_create_images_and_backing(self, disk_type): conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) self.mox.StubOutWithMock(conn, '_fetch_instance_kernel_ramdisk') self.mox.StubOutWithMock(libvirt_driver.libvirt_utils, 'create_image') - libvirt_driver.libvirt_utils.create_image(mox.IgnoreArg(), - mox.IgnoreArg(), - mox.IgnoreArg()) + disk_info = {'path': 'foo', 'type': disk_type, + 'disk_size': 1 * 1024 ** 3, + 'virt_disk_size': 20 * 1024 ** 3, + 'backing_file': None} + disk_info_json = jsonutils.dumps([disk_info]) + + libvirt_driver.libvirt_utils.create_image( + disk_info['type'], mox.IgnoreArg(), disk_info['virt_disk_size']) conn._fetch_instance_kernel_ramdisk(self.context, self.test_instance) self.mox.ReplayAll() self.stubs.Set(os.path, 'exists', lambda *args: False) - disk_info_json = jsonutils.dumps([{'path': 'foo', 'type': None, - 'disk_size': 0, - 'backing_file': None}]) conn._create_images_and_backing(self.context, self.test_instance, "/fake/instance/dir", disk_info_json) + def test_create_images_and_backing_qcow2(self): + self._do_test_create_images_and_backing('qcow2') + + def test_create_images_and_backing_raw(self): + self._do_test_create_images_and_backing('raw') + def test_create_images_and_backing_disk_info_none(self): conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False) self.mox.StubOutWithMock(conn, '_fetch_instance_kernel_ramdisk') diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 960e7ce..9654f62 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -4378,7 +4378,7 @@ class LibvirtDriver(driver.ComputeDriver): instance_disk = os.path.join(instance_dir, base) if not info['backing_file'] and not os.path.exists(instance_disk): libvirt_utils.create_image(info['type'], instance_disk, - info['disk_size']) + info['virt_disk_size']) elif info['backing_file']: # Creating backing file follows same way as spawning instances. cache_name = os.path.basename(info['backing_file']) @@ -4520,7 +4520,7 @@ class LibvirtDriver(driver.ComputeDriver): over_commit_size = int(virt_size) - dk_size else: backing_file = "" - virt_size = 0 + virt_size = dk_size over_commit_size = 0 disk_info.append({'type': disk_type, -- 1.8.4.1 ++++++ neutron-performance.patch ++++++ ++++ 637 lines (skipped) ++++++ nova-stable-havana.tar.gz ++++++ /work/SRC/openSUSE:Factory/openstack-nova/nova-stable-havana.tar.gz /work/SRC/openSUSE:Factory/.openstack-nova.new/nova-stable-havana.tar.gz differ: char 5, line 1 ++++++ nova-vmware-hypervisor-version.patch ++++++ Index: nova-2013.2.1.dev42.gf7cfc1c/nova/utils.py =================================================================== --- nova-2013.2.1.dev42.gf7cfc1c.orig/nova/utils.py +++ nova-2013.2.1.dev42.gf7cfc1c/nova/utils.py @@ -1165,7 +1165,7 @@ def is_none_string(val): def convert_version_to_int(version): - return version[0] * 1000000 + version[1] * 1000 + version[2] + return int(version[0]) * 1000000 + int(version[1]) * 1000 + int(version[2]) def is_neutron(): Index: nova-2013.2.1.dev42.gf7cfc1c/nova/tests/virt/vmwareapi/test_vmwareapi.py =================================================================== --- nova-2013.2.1.dev42.gf7cfc1c.orig/nova/tests/virt/vmwareapi/test_vmwareapi.py +++ nova-2013.2.1.dev42.gf7cfc1c/nova/tests/virt/vmwareapi/test_vmwareapi.py @@ -1068,7 +1068,7 @@ class VMwareAPIVCDriverTestCase(VMwareAP self.assertEquals(stats['memory_mb'], 1000) self.assertEquals(stats['memory_mb_used'], 500) self.assertEquals(stats['hypervisor_type'], 'VMware vCenter Server') - self.assertEquals(stats['hypervisor_version'], '5.1.0') + self.assertEquals(stats['hypervisor_version'], 5001000) self.assertEquals(stats['hypervisor_hostname'], self.node_name) self.assertEquals(stats['cpu_info'], jsonutils.dumps(cpu_info)) self.assertEquals(stats['supported_instances'], Index: nova-2013.2.1.dev42.gf7cfc1c/nova/virt/vmwareapi/host.py =================================================================== --- nova-2013.2.1.dev42.gf7cfc1c.orig/nova/virt/vmwareapi/host.py +++ nova-2013.2.1.dev42.gf7cfc1c/nova/virt/vmwareapi/host.py @@ -19,6 +19,7 @@ Management class for host-related functi """ from nova import exception +from nova import utils from nova.openstack.common.gettextutils import _ from nova.openstack.common import log as logging from nova.virt.vmwareapi import vim_util @@ -133,7 +134,9 @@ class HostState(object): data["host_memory_free"] = data["host_memory_total"] - \ summary.quickStats.overallMemoryUsage data["hypervisor_type"] = summary.config.product.name - data["hypervisor_version"] = summary.config.product.version + hypervisor_ver = summary.config.product.version.replace('.', '') + version = utils.convert_version_to_int(hypervisor_ver) + data["hypervisor_version"] = version data["hypervisor_hostname"] = self._host_name data["supported_instances"] = [('i686', 'vmware', 'hvm'), ('x86_64', 'vmware', 'hvm')] @@ -186,7 +189,9 @@ class VCState(object): data["host_memory_total"] = stats['mem']['total'] data["host_memory_free"] = stats['mem']['free'] data["hypervisor_type"] = about_info.name - data["hypervisor_version"] = about_info.version + hypervisor_ver = about_info.version.replace('.', '') + version = utils.convert_version_to_int(hypervisor_ver) + data["hypervisor_version"] = version data["hypervisor_hostname"] = self._host_name data["supported_instances"] = [('i686', 'vmware', 'hvm'), ('x86_64', 'vmware', 'hvm')] -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
