openstack/charm-neutron-gateway
Code Issues Proposed changes

sync charm-helpers

Browse Source
This commit is contained in:
Zhang Hua
2014-12-03 21:16:58 +08:00
parent 87b99ce676
commit 5125be6e7c
23 changed files with 795 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hooks/charmhelpers/contrib/storage/linux/loopback.py
View File

@@ -1,12 +1,12 @@
import os
import re
from subprocess import (
check_call,
check_output,
)
import six
##################################################
# loopback device helpers.
@@ -37,7 +37,7 @@ def create_loopback(file_path):
'''
file_path = os.path.abspath(file_path)
check_call(['losetup', '--find', file_path])
for d, f in loopback_devices().iteritems():
for d, f in six.iteritems(loopback_devices()):
if f == file_path:
return d
@@ -51,7 +51,7 @@ def ensure_loopback_device(path, size):
:returns: str: Full path to the ensured loopback device (eg, /dev/loop0)
'''
for d, f in loopback_devices().iteritems():
for d, f in six.iteritems(loopback_devices()):
if f == path:
return d