Merge lp:~corey.bryant/nova/2014.1.5 into lp:~ubuntu-server-dev/nova/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-23 14:25:59 +0000
+++ debian/changelog	2015-06-22 16:01:22 +0000
@@ -1,3 +1,31 @@
+nova (1:2014.1.5-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (08b5d48) (LP: #1467533):
+    - [74295ed] Use ebtables to isolate dhcp traffic
+    - [a83eb5f] VMware: fix AttributeError: TaskInfo instance has no attribute 'name'
+    - [8876294] libvirt: partial fix for live-migration with config drive
+    - [b77c188] Type conflict in trusted_filter.py using attestation_port default value
+    - [378a8d4] Use instance.uuid instead of instance
+    - [c12f21d] Make test_version_string_with_package_is_good work with pbr 0.11
+    - [1668178] Moves trusted filter unit tests into own file
+    - [4812617] Use hypervisor hostname for compute trust level
+    - [d8853ee] Recover from POWERING-* state on compute manager start-up
+    - [0784b0c] Avoid referring to juno-era exception type
+    - [f513a28] libvirt: Make sure volumes are well detected during block migration
+    - [68ec684] libvirt: avoid changing UUID when redefining nwfilters
+    - [cc86ef5] delete python bytecode before every test run
+    - [3501ec2] Drop use of oslo.utils in nova
+    - [392dc22] Eventlet green threads not released back to pool
+    - [1e03160] Sync strutils from oslo-incubator for mask_password fix
+    - [7292c02] Allow instances to attach to shared external nets
+    - [dbc348d] Fix libvirt watchdog support
+    - [08b5d48] HyperV Driver - Fix to implement hypervisor-uptime
+  * d/p/drop-oslo-utils-usage.patch: Dropped; Fixed upstream.
+  * d/p/recover-from-power-state-on-compute.patch: Dropped; Fixed upstream.
+  * d/p/fix-requirements.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Mon, 22 Jun 2015 10:15:07 -0400
+
 nova (1:2014.1.4-0ubuntu2.1) trusty; urgency=medium
 
   * Ensure that compute manager restarts during instance power

=== removed file 'debian/patches/drop-oslo-utils-usage.patch'
--- debian/patches/drop-oslo-utils-usage.patch	2015-03-17 16:46:32 +0000
+++ debian/patches/drop-oslo-utils-usage.patch	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-Description: Override python-oslo.utils dependency as it's not in trusty.
-Author: Corey Bryant <[e-mail]>
-Bug: https://bugs.launchpad.net/bugs/1432685
-Forwarded: yes
-
---- a/nova/compute/api.py
-+++ b/nova/compute/api.py
-@@ -26,7 +26,6 @@
- import uuid
- 
- from oslo.config import cfg
--from oslo.utils import units
- import six
- 
- from nova import availability_zones
-@@ -68,6 +67,7 @@
- from nova.openstack.common import log as logging
- from nova.openstack.common import strutils
- from nova.openstack.common import timeutils
-+from nova.openstack.common import units
- from nova.openstack.common import uuidutils
- import nova.policy
- from nova import quota
---- a/nova/tests/compute/test_compute.py
-+++ b/nova/tests/compute/test_compute.py
-@@ -31,7 +31,6 @@
- import mox
- from oslo.config import cfg
- from oslo import messaging
--from oslo.utils import units
- import six
- from testtools import matchers as testtools_matchers
- 
-@@ -69,6 +68,7 @@
- from nova.openstack.common import jsonutils
- from nova.openstack.common import log as logging
- from nova.openstack.common import timeutils
-+from nova.openstack.common import units
- from nova.openstack.common import uuidutils
- from nova import policy
- from nova import quota

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2015-03-17 16:46:32 +0000
+++ debian/patches/fix-requirements.patch	2015-06-22 16:01:22 +0000
@@ -6,10 +6,10 @@
 @@ -25,9 +25,8 @@
  python-neutronclient>=2.3.4,<2.3.11
  python-glanceclient>=0.9.0,!=0.14.0,<=0.14.2
- python-keystoneclient>=0.7.0,<=0.11.2
--six>=1.6.0
-+six>=1.5.2
- stevedore>=0.14,<1.2
+ python-keystoneclient>=0.7.0,<0.12.0
+-six>=1.6.0,<=1.9.0
++six>=1.5.2,<=1.9.0
+ stevedore>=0.14
 -websockify>=0.5.1,<0.6
  wsgiref>=0.1.2
  oslo.config>=1.2.0,<1.5

=== removed file 'debian/patches/recover-from-power-state-on-compute.patch'
--- debian/patches/recover-from-power-state-on-compute.patch	2015-04-23 14:25:59 +0000
+++ debian/patches/recover-from-power-state-on-compute.patch	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-From d8853eef181fabebc13bdfdaa98818cfcef318be Mon Sep 17 00:00:00 2001
-From: David McNally <[e-mail]>
-Date: Fri, 22 Nov 2013 16:18:53 +0000
-Subject: [PATCH] Recover from POWERING-* state on compute manager start-up
-
-If a compute manager is stopped / fails during POWERING-ON or
-POWERING-OFF operations then the instance will be left stuck in
-a transitional task_state.
-
-This change handles both these states by simply either retriggering
-the power on or power off request on start-up of the compute manager.
-If the operation had previously completed then retrying will
-essentially be a no-op so it is safe to handle instances in this
-state in this way.
-
-Closes bug: #1304333
-
-(cherry picked from commit 8f7056f48c115ee0939c76ce08531dab0f14e354)
-Change-Id: I262be6b13a764bc1355be34cdc0180e8e87f260b
----
- nova/compute/manager.py                | 26 ++++++++++++++++++
- nova/tests/compute/test_compute_mgr.py | 48 ++++++++++++++++++++++++++++++++++
- 2 files changed, 74 insertions(+)
-
-diff --git a/nova/compute/manager.py b/nova/compute/manager.py
-index 2955796..900f861 100644
---- a/nova/compute/manager.py
-+++ b/nova/compute/manager.py
-@@ -919,6 +919,32 @@ class ComputeManager(manager.Manager):
-             instance.vm_state = vm_states.ACTIVE
-             instance.save()
- 
-+        if instance.task_state == task_states.POWERING_OFF:
-+            try:
-+                LOG.debug(_("Instance in transitional state %s at start-up "
-+                            "retrying stop request"),
-+                            instance['task_state'], instance=instance)
-+                self.stop_instance(context, instance)
-+            except Exception:
-+                # we don't want that an exception blocks the init_host
-+                msg = _('Failed to stop instance')
-+                LOG.exception(msg, instance=instance)
-+            finally:
-+                return
-+
-+        if instance.task_state == task_states.POWERING_ON:
-+            try:
-+                LOG.debug(_("Instance in transitional state %s at start-up "
-+                            "retrying start request"),
-+                            instance['task_state'], instance=instance)
-+                self.start_instance(context, instance)
-+            except Exception:
-+                # we don't want that an exception blocks the init_host
-+                msg = _('Failed to start instance')
-+                LOG.exception(msg, instance=instance)
-+            finally:
-+                return
-+
-         net_info = compute_utils.get_nw_info_for_instance(instance)
-         try:
-             self.driver.plug_vifs(instance, net_info)
-diff --git a/nova/tests/compute/test_compute_mgr.py b/nova/tests/compute/test_compute_mgr.py
-index 92e1bb5..78ffdef 100644
---- a/nova/tests/compute/test_compute_mgr.py
-+++ b/nova/tests/compute/test_compute_mgr.py
-@@ -616,6 +616,54 @@ class ComputeManagerUnitTestCase(test.NoDBTestCase):
-         instance.power_state = power_state.RUNNING
-         self._test_init_instance_cleans_reboot_state(instance)
- 
-+    def test_init_instance_retries_power_off(self):
-+        instance = instance_obj.Instance(self.context)
-+        instance.uuid = 'foo'
-+        instance.id = 1
-+        instance.vm_state = vm_states.ACTIVE
-+        instance.task_state = task_states.POWERING_OFF
-+        with mock.patch.object(self.compute, 'stop_instance'):
-+            self.compute._init_instance(self.context, instance)
-+            call = mock.call(self.context, instance)
-+            self.compute.stop_instance.assert_has_calls([call])
-+
-+    def test_init_instance_retries_power_on(self):
-+        instance = instance_obj.Instance(self.context)
-+        instance.uuid = 'foo'
-+        instance.id = 1
-+        instance.vm_state = vm_states.ACTIVE
-+        instance.task_state = task_states.POWERING_ON
-+        with mock.patch.object(self.compute, 'start_instance'):
-+            self.compute._init_instance(self.context, instance)
-+            call = mock.call(self.context, instance)
-+            self.compute.start_instance.assert_has_calls([call])
-+
-+    def test_init_instance_retries_power_on_silent_exception(self):
-+        instance = instance_obj.Instance(self.context)
-+        instance.uuid = 'foo'
-+        instance.id = 1
-+        instance.vm_state = vm_states.ACTIVE
-+        instance.task_state = task_states.POWERING_ON
-+        with mock.patch.object(self.compute, 'start_instance',
-+                              return_value=Exception):
-+            init_return = self.compute._init_instance(self.context, instance)
-+            call = mock.call(self.context, instance)
-+            self.compute.start_instance.assert_has_calls([call])
-+            self.assertIsNone(init_return)
-+
-+    def test_init_instance_retries_power_off_silent_exception(self):
-+        instance = instance_obj.Instance(self.context)
-+        instance.uuid = 'foo'
-+        instance.id = 1
-+        instance.vm_state = vm_states.ACTIVE
-+        instance.task_state = task_states.POWERING_OFF
-+        with mock.patch.object(self.compute, 'stop_instance',
-+                              return_value=Exception):
-+            init_return = self.compute._init_instance(self.context, instance)
-+            call = mock.call(self.context, instance)
-+            self.compute.stop_instance.assert_has_calls([call])
-+            self.assertIsNone(init_return)
-+
-     def test_get_instances_on_driver(self):
-         fake_context = context.get_admin_context()
- 
--- 
-1.9.1
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-04-23 14:25:59 +0000
+++ debian/patches/series	2015-06-22 16:01:22 +0000
@@ -1,8 +1,6 @@
 # Ubuntu specific patches below here. Note these can be dropped eventually.
-drop-oslo-utils-usage.patch
 disable-websockify-tests.patch
 fix-requirements.patch
 skip_ipv6_test.patch
 arm-console-patch.patch
 update-run-tests.patch
-recover-from-power-state-on-compute.patch