Merge "Fix NoneType has no attribute get" into stable/ocata
This commit is contained in:
commit
c10a5629a2
@ -297,7 +297,8 @@ class FilterScheduler(driver.Scheduler):
|
|||||||
# Since Cinder is using mixed filters from Oslo and it's own, which
|
# Since Cinder is using mixed filters from Oslo and it's own, which
|
||||||
# takes 'resource_XX' and 'volume_XX' as input respectively, copying
|
# takes 'resource_XX' and 'volume_XX' as input respectively, copying
|
||||||
# 'volume_XX' to 'resource_XX' will make both filters happy.
|
# 'volume_XX' to 'resource_XX' will make both filters happy.
|
||||||
volume_type = resource_type = request_spec.get("volume_type")
|
volume_type = request_spec.get("volume_type")
|
||||||
|
resource_type = request_spec.get("volume_type", {})
|
||||||
|
|
||||||
config_options = self._get_configuration_options()
|
config_options = self._get_configuration_options()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user