[upstream] improve the cinder project patch

The original patch didn't apply cleanly.  This
fixes that problem and makes it less likely to fail.

Change-Id: I59b11bd9ce12f1118e4ac56db66b01f4574074af

project_exercises_boston/cinder-lvm_log_message.patch

@@ -1,33 +1,37 @@
-From ff6c974e990c660de7d46ed53da0f6f516dc76a3 Mon Sep 17 00:00:00 2001
-From: "Jay S. Bryant" <jsbryant@electronicjungle.net>
-Date: Thu, 4 May 2017 13:15:59 -0500
-Subject: [PATCH] Add log messages to volume create flow
+From 4b9f15956439f90e01b333c5f8662fd54886a4b1 Mon Sep 17 00:00:00 2001
+From: Ubuntu <ubuntu@upstream-training>
+Date: Fri, 5 May 2017 18:55:42 +0000
+Subject: [PATCH] Add logging in the LVM driver
 
-This patch adds some additional logging when creating
-LVM volumes.
+This patch adds some logging to the create
+path for the LVM driver.
 ---
- cinder/manager.py            | 2 +-
- cinder/volume/drivers/lvm.py | 6 +++++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
+ cinder/volume/drivers/lvm.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/cinder/manager.py b/cinder/manager.py
-index d5bc6ef..a5686d9 100644
---- a/cinder/manager.py
-+++ b/cinder/manager.py
-@@ -58,8 +58,8 @@ import oslo_messaging as messaging
- from oslo_service import periodic_task
- from oslo_utils import timeutils
- 
--from cinder import context
- from cinder import db
-+from cinder import context
- from cinder.db import base
- from cinder import exception
- from cinder.i18n import _LE, _LI, _LW
 diff --git a/cinder/volume/drivers/lvm.py b/cinder/volume/drivers/lvm.py
-index 2271468..bc1abf4 100644
+index f0af9f3..01ffdaf 100644
 --- a/cinder/volume/drivers/lvm.py
 +++ b/cinder/volume/drivers/lvm.py
+@@ -27,8 +27,8 @@ from oslo_utils import importutils
+ from oslo_utils import units
+ import six
+ 
+-from cinder.brick.local_dev import lvm as lvm
+ from cinder import exception
++from cinder.brick.local_dev import lvm as lvm
+ from cinder.i18n import _
+ from cinder.image import image_utils
+ from cinder import interface
+@@ -37,7 +37,7 @@ from cinder import utils
+ from cinder.volume import driver
+ from cinder.volume import utils as volutils
+ 
+-LOG = logging.getLogger(__name__)
++LOG = logging.getLogger(__name__) 
+ 
+ # FIXME(jdg):  We'll put the lvm_ prefix back on these when we
+ # move over to using this as the real LVM driver, for now we'll
 @@ -196,6 +196,8 @@ class LVMVolumeDriver(driver.VolumeDriver):
          if vg is not None:
              vg_ref = vg