WaltHP

from oslo_utils import importutils
import platform
import sys


ALL = 'all'
LINUX = 'linux'
WINDOWS = 'windows'

connector_map = [

WaltHP

diff --git a/os_brick/initiator/connector.py b/os_brick/initiator/connector.py
index e1bfa71..be3dee9 100644
--- a/os_brick/initiator/connector.py
+++ b/os_brick/initiator/connector.py
@@ -311,6 +311,10 @@ class InitiatorConnector(executor.Executor):
                 LOG.debug("Unable to find multipath device name for "
                           "volume. Using path %(device)s for volume.",
                           {'device': self.host_device})
+        else:
+            device_path = path

WaltHP

diff --git a/os_brick/initiator/connector.py b/os_brick/initiator/connector.py
index 81e2711..a3e442e 100644
--- a/os_brick/initiator/connector.py
+++ b/os_brick/initiator/connector.py
@@ -290,12 +290,14 @@ class InitiatorConnector(executor.Executor):
     def _discover_mpath_device(self, device_wwn,
                                connection_properties):
         path = self._linuxscsi.find_multipath_device_path(device_wwn)
-        device_path = path
+        device_path = None

WaltHP

diff --git a/cinder/volume/drivers/hpe/hpe_3par_common.py b/cinder/volume/drivers/hpe/hpe_3par_common.py
index d1a769b..a4cddfa 100644
--- a/cinder/volume/drivers/hpe/hpe_3par_common.py
+++ b/cinder/volume/drivers/hpe/hpe_3par_common.py
@@ -1704,6 +1704,37 @@ class HPE3PARCommon(object):
             model_update = None
         return model_update
 
+    def _get_temp_snapshot(self, volume):
+        """Try and create/get a temporary snapshot of a volume.

WaltHP

diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py
index c6e0c71..7bc7c2a 100644
--- a/cinder/api/contrib/volume_actions.py
+++ b/cinder/api/contrib/volume_actions.py
@@ -98,15 +98,16 @@ class VolumeActionsController(wsgi.Controller):
         else:
             mode = 'rw'
 
-        if instance_uuid and host_name:
-            msg = _("Invalid request to attach volume to an "

WaltHP

diff --git a/nova/virt/block_device.py b/nova/virt/block_device.py
index 47302e8..a771313 100644
--- a/nova/virt/block_device.py
+++ b/nova/virt/block_device.py
@@ -313,7 +313,8 @@ class DriverVolumeBlockDevice(DriverBlockDevice):
         self.save()
         try:
             volume_api.attach(context, volume_id, instance.uuid,
-                              self['mount_device'], mode=mode)
+                              self['mount_device'], mode=mode,

WaltHP

diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py
index c6e0c71..7bc7c2a 100644
--- a/cinder/api/contrib/volume_actions.py
+++ b/cinder/api/contrib/volume_actions.py
@@ -98,15 +98,16 @@ class VolumeActionsController(wsgi.Controller):
         else:
             mode = 'rw'
 
-        if instance_uuid and host_name:
-            msg = _("Invalid request to attach volume to an "

WaltHP

diff --git a/cinder/api/contrib/volume_actions.py b/cinder/api/contrib/volume_actions.py
index c6e0c71..7bc7c2a 100644
--- a/cinder/api/contrib/volume_actions.py
+++ b/cinder/api/contrib/volume_actions.py
@@ -98,15 +98,16 @@ class VolumeActionsController(wsgi.Controller):
         else:
             mode = 'rw'
 
-        if instance_uuid and host_name:
-            msg = _("Invalid request to attach volume to an "

WaltHP

Target 1: iqn.2010-10.org.openstack:volume-4db4b8b5-74d3-4b17-88e2-f91f9a5f12b5
    System information:
        Driver: iscsi
        State: ready
    I_T nexus information:
    LUN information:
        LUN: 0
            Type: controller
            SCSI ID: IET     00010000
            SCSI SN: beaf10

WaltHP

#!/bin/bash

source ~/devstack/openrc admin admin

VOLUME=""
VOLNAME=""

INSTANCE=${1:-${INSTANCE}}
SIZE=${2:-1}