File project.diff of Package openstack-nova-doc
--- 0001-Consider-domain-when-truncating-hostnames.patch.orig
+++ 0001-Consider-domain-when-truncating-hostnames.patch
@@ -14,11 +14,11 @@ Date: Wed Aug 17 17:42:58 2016 +0200
Change-Id: I3468057e0485adef06540782980d58ebd143d95b
Closes-Bug: 1614148
-diff --git a/nova/tests/unit/test_utils.py b/nova/tests/unit/test_utils.py
-index 83b41a15b3ec..91cd68837e2d 100644
---- a/nova/tests/unit/test_utils.py
-+++ b/nova/tests/unit/test_utils.py
-@@ -108,7 +108,7 @@ class GenericUtilsTestCase(test.NoDBTestCase):
+Index: nova-13.1.2.dev23/nova/tests/unit/test_utils.py
+===================================================================
+--- nova-13.1.2.dev23.orig/nova/tests/unit/test_utils.py
++++ nova-13.1.2.dev23/nova/tests/unit/test_utils.py
+@@ -108,7 +108,7 @@ class GenericUtilsTestCase(test.NoDBTest
def test_hostname_empty_has_default_too_long(self):
hostname = u"\u7684"
defaultname = "a" * 64
@@ -27,7 +27,7 @@ index 83b41a15b3ec..91cd68837e2d 100644
defaultname))
def test_hostname_empty_no_default(self):
-@@ -125,14 +125,14 @@ class GenericUtilsTestCase(test.NoDBTestCase):
+@@ -125,14 +125,14 @@ class GenericUtilsTestCase(test.NoDBTest
def test_hostname_too_long(self):
hostname = "a" * 64
@@ -46,11 +46,11 @@ index 83b41a15b3ec..91cd68837e2d 100644
self.assertFalse(res.endswith('-'), 'The hostname ends with a -')
def test_generate_password(self):
-diff --git a/nova/utils.py b/nova/utils.py
-index 72c92e1836b2..a74225749fd0 100644
---- a/nova/utils.py
-+++ b/nova/utils.py
-@@ -775,11 +775,19 @@ def sanitize_hostname(hostname, default_name=None):
+Index: nova-13.1.2.dev23/nova/utils.py
+===================================================================
+--- nova-13.1.2.dev23.orig/nova/utils.py
++++ nova-13.1.2.dev23/nova/utils.py
+@@ -789,11 +789,19 @@ def sanitize_hostname(hostname, default_
"""
def truncate_hostname(name):
--- 0001-Fix-nova-delete-with-EFI-booted-VMs.patch.orig
+++ 0001-Fix-nova-delete-with-EFI-booted-VMs.patch
@@ -18,10 +18,10 @@ Closes-Bug: #1567807
nova/virt/libvirt/guest.py | 3 ++-
4 files changed, 8 insertions(+), 5 deletions(-)
-Index: nova-13.1.1.dev18/nova/tests/unit/virt/libvirt/fakelibvirt.py
+Index: nova-13.1.2.dev39/nova/tests/unit/virt/libvirt/fakelibvirt.py
===================================================================
---- nova-13.1.1.dev18.orig/nova/tests/unit/virt/libvirt/fakelibvirt.py
-+++ nova-13.1.1.dev18/nova/tests/unit/virt/libvirt/fakelibvirt.py
+--- nova-13.1.2.dev39.orig/nova/tests/unit/virt/libvirt/fakelibvirt.py
++++ nova-13.1.2.dev39/nova/tests/unit/virt/libvirt/fakelibvirt.py
@@ -68,6 +68,7 @@ VIR_DOMAIN_EVENT_SHUTDOWN = 6
VIR_DOMAIN_EVENT_PMSUSPENDED = 7
@@ -30,11 +30,11 @@ Index: nova-13.1.1.dev18/nova/tests/unit
VIR_DOMAIN_AFFECT_CURRENT = 0
VIR_DOMAIN_AFFECT_LIVE = 1
-Index: nova-13.1.1.dev18/nova/tests/unit/virt/libvirt/test_driver.py
+Index: nova-13.1.2.dev39/nova/tests/unit/virt/libvirt/test_driver.py
===================================================================
---- nova-13.1.1.dev18.orig/nova/tests/unit/virt/libvirt/test_driver.py
-+++ nova-13.1.1.dev18/nova/tests/unit/virt/libvirt/test_driver.py
-@@ -10557,7 +10557,7 @@ class LibvirtConnTestCase(test.NoDBTestC
+--- nova-13.1.2.dev39.orig/nova/tests/unit/virt/libvirt/test_driver.py
++++ nova-13.1.2.dev39/nova/tests/unit/virt/libvirt/test_driver.py
+@@ -10710,7 +10710,7 @@ class LibvirtConnTestCase(test.NoDBTestC
mock = self.mox.CreateMock(fakelibvirt.virDomain)
mock.ID()
mock.destroy()
@@ -43,7 +43,7 @@ Index: nova-13.1.1.dev18/nova/tests/unit
mock.ID().AndReturn(123)
mock.undefine()
-@@ -10586,7 +10586,7 @@ class LibvirtConnTestCase(test.NoDBTestC
+@@ -10739,7 +10739,7 @@ class LibvirtConnTestCase(test.NoDBTestC
mock = self.mox.CreateMock(fakelibvirt.virDomain)
mock.ID()
mock.destroy()
@@ -52,7 +52,7 @@ Index: nova-13.1.1.dev18/nova/tests/unit
mock.hasManagedSaveImage(0).AndReturn(True)
mock.managedSaveRemove(0)
mock.undefine()
-@@ -10616,7 +10616,7 @@ class LibvirtConnTestCase(test.NoDBTestC
+@@ -10769,7 +10769,7 @@ class LibvirtConnTestCase(test.NoDBTestC
mock = self.mox.CreateMock(fakelibvirt.virDomain)
mock.ID()
mock.destroy()
@@ -61,10 +61,10 @@ Index: nova-13.1.1.dev18/nova/tests/unit
mock.hasManagedSaveImage(0).AndRaise(AttributeError())
mock.undefine()
-Index: nova-13.1.1.dev18/nova/tests/unit/virt/libvirt/test_guest.py
+Index: nova-13.1.2.dev39/nova/tests/unit/virt/libvirt/test_guest.py
===================================================================
---- nova-13.1.1.dev18.orig/nova/tests/unit/virt/libvirt/test_guest.py
-+++ nova-13.1.1.dev18/nova/tests/unit/virt/libvirt/test_guest.py
+--- nova-13.1.2.dev39.orig/nova/tests/unit/virt/libvirt/test_guest.py
++++ nova-13.1.2.dev39/nova/tests/unit/virt/libvirt/test_guest.py
@@ -151,7 +151,8 @@ class GuestTestCase(test.NoDBTestCase):
def test_delete_configuration(self):
self.guest.delete_configuration()
@@ -75,10 +75,10 @@ Index: nova-13.1.1.dev18/nova/tests/unit
def test_delete_configuration_exception(self):
self.domain.undefineFlags.side_effect = fakelibvirt.libvirtError(
-Index: nova-13.1.1.dev18/nova/virt/libvirt/guest.py
+Index: nova-13.1.2.dev39/nova/virt/libvirt/guest.py
===================================================================
---- nova-13.1.1.dev18.orig/nova/virt/libvirt/guest.py
-+++ nova-13.1.1.dev18/nova/virt/libvirt/guest.py
+--- nova-13.1.2.dev39.orig/nova/virt/libvirt/guest.py
++++ nova-13.1.2.dev39/nova/virt/libvirt/guest.py
@@ -217,7 +217,8 @@ class Guest(object):
"""Undefines a domain from hypervisor."""
try:
--- migrate-uri.patch.orig
+++ migrate-uri.patch
@@ -1,6 +1,8 @@
---- nova/virt/libvirt/driver.py 2016-08-17 18:32:35.539872304 +0200
-+++ nova/virt/libvirt/driver.py.NEW 2016-08-17 18:37:55.852162619 +0200
-@@ -37,6 +37,7 @@
+Index: nova/virt/libvirt/driver.py
+===================================================================
+--- nova/virt/libvirt/driver.py.orig
++++ nova/virt/libvirt/driver.py
+@@ -37,6 +37,7 @@ import os
import shutil
import tempfile
import time
@@ -8,7 +10,7 @@
import uuid
import eventlet
-@@ -839,7 +840,7 @@
+@@ -839,7 +840,7 @@ class LibvirtDriver(driver.ComputeDriver
return uri
@staticmethod
@@ -17,7 +19,7 @@
# Only Xen and QEMU support live migration, see
# https://libvirt.org/migration.html#scenarios for reference
uris = {
-@@ -851,8 +852,19 @@
+@@ -851,8 +852,19 @@ class LibvirtDriver(driver.ComputeDriver
uri = CONF.libvirt.live_migration_uri or uris.get(virt_type)
if uri is None:
raise exception.LiveMigrationURINotAvailable(virt_type=virt_type)
@@ -37,15 +39,15 @@
def instance_exists(self, instance):
"""Efficient override of base instance_exists method."""
try:
-@@ -6039,6 +6051,7 @@
+@@ -6050,6 +6062,7 @@ class LibvirtDriver(driver.ComputeDriver
'bandwidth': CONF.libvirt.live_migration_bandwidth,
'destination_xml': new_xml_str,
'migrate_disks': device_names,
+ 'migrate_uri': str(self._migrate_uri(dest)),
}
- dom.migrateToURI3(
- self._live_migration_uri(dest),
-@@ -6047,7 +6060,7 @@
+ # NOTE(pkoniszewski): Because of precheck which blocks
+ # tunnelled block live migration with mapped volumes we
+@@ -6070,7 +6083,7 @@ class LibvirtDriver(driver.ComputeDriver
else:
dom.migrateToURI2(
self._live_migration_uri(dest),
--- openstack-nova-doc.changes.orig
+++ openstack-nova-doc.changes
@@ -1,4 +1,37 @@
-------------------------------------------------------------------
+Wed Sep 21 10:36:37 UTC 2016 - cloud-devel@suse.de
+
+- Update to version nova-13.1.2.dev41:
+ * Updated from global requirements
+
+-------------------------------------------------------------------
+Wed Sep 21 07:54:45 UTC 2016 - mjura@suse.com
+
+- Update to version nova-13.1.2.dev39:
+ * Default image.size to 0 when extracting v1 image attributes
+ * virt: handle unicode when logging LifecycleEvents
+ * db: retry on deadlocks while adding an instance
+ * ironic_host_manager: fix population of instances info on start
+ * ironic_host_manager: fix population of instances info on schedule
+ * Refresh info_cache after deleting floating IP
+ * ironic: Cleanup instance information when spawn fails
+ * libvirt: Prevent block live migration with tunnelled flag
+ * VMware: Use Port Group and Key in binding details
+
+-------------------------------------------------------------------
+Fri Sep 16 23:51:01 UTC 2016 - cloud-devel@suse.de
+
+- Update to version nova-13.1.2.dev23:
+ * Properly quote IPv6 address in RsyncDriver
+ * Ensures that progress_watermark and progress_time are updated
+
+-------------------------------------------------------------------
+Fri Sep 9 07:04:24 UTC 2016 - cloud-devel@suse.de
+
+- Update to version nova-13.1.2.dev19:
+ * Imported Translations from Zanata
+
+-------------------------------------------------------------------
Thu Sep 8 23:51:43 UTC 2016 - cloud-devel@suse.de
- Update to version nova-13.1.2.dev17:
--- openstack-nova-doc.spec.orig
+++ openstack-nova-doc.spec
@@ -19,10 +19,10 @@
%define component nova
%define majorversion 2012.2.3
-%define version_unconverted 13.1.2.dev17
+%define version_unconverted 13.1.2.dev41
Name: openstack-%{component}-doc
-Version: 13.1.2~a0~dev17
+Version: 13.1.2~a0~dev41
Release: 0
Summary: OpenStack Compute (Nova) - Documentation
License: Apache-2.0
--- openstack-nova.changes.orig
+++ openstack-nova.changes
@@ -1,4 +1,42 @@
-------------------------------------------------------------------
+Wed Sep 21 10:37:04 UTC 2016 - cloud-devel@suse.de
+
+- Update to version nova-13.1.2.dev41:
+ * Updated from global requirements
+
+-------------------------------------------------------------------
+Wed Sep 21 07:50:56 UTC 2016 - mjura@suse.com
+
+- Rebase migrate-uri.patch and fix trackupstream job
+
+-------------------------------------------------------------------
+Wed Sep 21 07:38:09 UTC 2016 - cloud-devel@suse.de
+
+- Update to version nova-13.1.2.dev39:
+ * Default image.size to 0 when extracting v1 image attributes
+ * virt: handle unicode when logging LifecycleEvents
+ * db: retry on deadlocks while adding an instance
+ * ironic_host_manager: fix population of instances info on start
+ * ironic_host_manager: fix population of instances info on schedule
+ * Refresh info_cache after deleting floating IP
+ * ironic: Cleanup instance information when spawn fails
+ * libvirt: Prevent block live migration with tunnelled flag
+ * VMware: Use Port Group and Key in binding details
+
+-------------------------------------------------------------------
+Fri Sep 16 23:51:29 UTC 2016 - cloud-devel@suse.de
+
+- Update to version nova-13.1.2.dev23:
+ * Properly quote IPv6 address in RsyncDriver
+ * Ensures that progress_watermark and progress_time are updated
+
+-------------------------------------------------------------------
+Fri Sep 9 07:04:40 UTC 2016 - cloud-devel@suse.de
+
+- Update to version nova-13.1.2.dev19:
+ * Imported Translations from Zanata
+
+-------------------------------------------------------------------
Thu Sep 8 23:52:18 UTC 2016 - cloud-devel@suse.de
- Update to version nova-13.1.2.dev17:
--- openstack-nova.spec.orig
+++ openstack-nova.spec
@@ -24,10 +24,10 @@
%define _rundir %{_localstatedir}/run
%endif
-%define version_unconverted 13.1.2.dev17
+%define version_unconverted 13.1.2.dev41
Name: openstack-%{component}
-Version: 13.1.2~a0~dev17
+Version: 13.1.2~a0~dev41
Release: 0
Summary: OpenStack Compute (Nova)
License: Apache-2.0
