openstack
/
manila
Code Issues Proposed changes

Last sync to Manila from oslo-incubator 

Oslo incubator is going away, and we cannot use the sync script
to copy the incubator files to Manila one last time because at
least one file has changed in Manila since the last sync.  This
commit includes the remaining changes which we do want.  The files
are consistent with the oslo-incubator master branch as of commit
305c2b0d52d387c0039e3b3021c4de27e85cd175.

Change-Id: Ib880a0108e4a567ebe39aa1ada7f872c63a818f1
This commit is contained in:
Clinton Knight 2015-11-17 17:05:36 -08:00
parent 193c825151
commit 1070ba728e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manila/openstack/common/scheduler/filters/capabilities_filter.py
View File

@ -47,8 +47,11 @@ class CapabilitiesFilter(filters.BaseHostFilter):
try:
cap = cap.get(scope[index])
except AttributeError:
return False
cap = None
if cap is None:
LOG.debug("Host doesn't provide capability '%(cap)s' "
"listed in the extra specs",
{'cap': scope[index]})
return False
if not extra_specs_ops.match(cap, req):
LOG.debug("extra_spec requirement '%(req)s' "

4
tools/install_venv.py
View File

@ -48,8 +48,8 @@ def print_help(venv, root):
def main(argv):
root = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
if os.environ.get('tools_path'):
root = os.environ['tools_path']
if os.environ.get('TOOLS_PATH'):
root = os.environ['TOOLS_PATH']
venv = os.path.join(root, '.venv')
if os.environ.get('VENV'):
venv = os.environ['VENV']

5
tools/with_venv.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash
TOOLS_PATH=${TOOLS_PATH:-$(dirname $0)}
TOOLS_PATH=${TOOLS_PATH:-$(dirname $0)/../}
VENV_PATH=${VENV_PATH:-${TOOLS_PATH}}
VENV_DIR=${VENV_NAME:-/../.venv}
TOOLS=${TOOLS_PATH}
VENV_DIR=${VENV_DIR:-/.venv}
VENV=${VENV:-${VENV_PATH}/${VENV_DIR}}
source ${VENV}/bin/activate && "$@"