WaltHP

diff --git a/openstack/user_preference.py b/openstack/user_preference.py
index bb97800..199b885 100644
--- a/openstack/user_preference.py
+++ b/openstack/user_preference.py
@@ -63,6 +63,7 @@ from openstack.network import network_service
 from openstack.object_store import object_store_service
 from openstack.orchestration import orchestration_service
 from openstack.telemetry import telemetry_service
+from openstack.volume import volume_service
 

WaltHP

diff --git a/cinder/zonemanager/fc_san_lookup_service.py b/cinder/zonemanager/fc_san_lookup_service.py
index 48b0df6..f61b500 100644
--- a/cinder/zonemanager/fc_san_lookup_service.py
+++ b/cinder/zonemanager/fc_san_lookup_service.py
@@ -49,8 +49,6 @@ class FCSanLookupService(fc_common.FCCommon):
     def __init__(self, **kwargs):
         super(FCSanLookupService, self).__init__(**kwargs)
 
-        self.configuration = kwargs.get('configuration', None)
-

WaltHP

diff --git a/cinder/zonemanager/fc_san_lookup_service.py b/cinder/zonemanager/fc_san_lookup_service.py
index 48b0df6..f61b500 100644
--- a/cinder/zonemanager/fc_san_lookup_service.py
+++ b/cinder/zonemanager/fc_san_lookup_service.py
@@ -49,8 +49,6 @@ class FCSanLookupService(fc_common.FCCommon):
     def __init__(self, **kwargs):
         super(FCSanLookupService, self).__init__(**kwargs)
 
-        self.configuration = kwargs.get('configuration', None)
-

WaltHP

#!/bin/bash
set -f;
IFS='
'
`vagrant box list > boxes.txt`
box_list=`cat boxes.txt`
set +f; unset $IFS
#echo $box_list

for box in $box_list

WaltHP

#!/bin/bash
# script that creates a new vagrant in ~/vagrant/<name>

BASE_PATH="$HOME/vagrant"
VAGRANT_NAME=""
VAGRANT_BOX=""
START_VAGRANT=0
BYPASS_DEVSTACK="false"
VM_RAM=8192
VM_CPUS=2

WaltHP

#!/bin/bash
# script that creates a new vagrant in ~/vagrant/<name>

BASE_PATH="$HOME/vagrant"
VAGRANT_NAME=""
VAGRANT_BOX=""
START_VAGRANT=0
BYPASS_DEVSTACK="false"
VM_RAM=8192
VM_CPUS=2

WaltHP

#!/bin/bash
# script that creates a new vagrant in ~/vagrant/<name>

# For debugging this script -- skips the slow stuff (vagrant box list, git clone, vagrant up)
# DEBUG=1

# Capture dir in which this script lives
SCRIPTDIR=$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")

BASE_PATH="$HOME/vagrant"

WaltHP

diff --git a/cinder/scheduler/filter_scheduler.py b/cinder/scheduler/filter_scheduler.py
index c9dd604..fd33178 100644
--- a/cinder/scheduler/filter_scheduler.py
+++ b/cinder/scheduler/filter_scheduler.py
@@ -283,6 +283,15 @@ class FilterScheduler(driver.Scheduler):
         self.populate_filter_properties(request_spec,
                                         filter_properties)
 
+        # If multiattach is enabled on a volume, we need to add
+        # multiattach to extra specs, so that the capability

WaltHP

diff --git a/nova/storage/linuxscsi.py b/nova/storage/linuxscsi.py
index ed30462..bb7c265 100644
--- a/nova/storage/linuxscsi.py
+++ b/nova/storage/linuxscsi.py
@@ -150,3 +150,13 @@ def find_multipath_device(device):
                 "devices": devices}
         return info
     return None
+
+

WaltHP

diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py
index 2e562a3..2eeabd1 100644
--- a/cinder/volume/drivers/san/hp/hp_3par_common.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_common.py
@@ -748,6 +748,7 @@ class HP3PARCommon(object):
                       'free_capacity_gb': 0,
                       'reserved_percentage': 0,
                       'pools': pools}
+        LOG.warning(self.stats)