x/packstack
Code Issues Proposed changes

Merge "Strip host and device when parsing Swift storage hosts"

Browse Source
This commit is contained in:
Jenkins
2013-02-22 17:48:56 +00:00
committed by Gerrit Code Review
parent d572e6f93f ad47ffc6c9
commit 102c8f2aaa
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packstack/plugins/swift_600.py
View File

@@ -139,15 +139,21 @@ def createkeystonemanifest():
devices = [] devices = []
def parseDevices(config_swift_storage_hosts): def parse_devices(config_swift_storage_hosts):
"""
Returns dict containing information about Swift storage devices.
"""
device_number = 0 device_number = 0
num_zones = int(controller.CONF["CONFIG_SWIFT_STORAGE_ZONES"])
for host in config_swift_storage_hosts.split(","): for host in config_swift_storage_hosts.split(","):
host = host.strip()
device_number += 1 device_number += 1
device = None device = None
if '/' in host: if '/' in host:
host, device = host.split('/')[0:2] host, device = map(lambda x: x.strip(), host.split('/', 1))
zone = (device_number % int(controller.CONF["CONFIG_SWIFT_STORAGE_ZONES"]))+1 zone = str((device_number % num_zones) + 1)
devices.append({'host':host, 'device':device, 'device_name':'device%s'%device_number, 'zone':str(zone)}) devices.append({'host': host, 'device': device, 'zone': zone,
'device_name': 'device%s' % device_number})
return devices return devices
@@ -161,7 +167,7 @@ def createbuildermanifest():
# Add each device to the ring # Add each device to the ring
devicename = 0 devicename = 0
for device in parseDevices(controller.CONF["CONFIG_SWIFT_STORAGE_HOSTS"]): for device in parse_devices(controller.CONF["CONFIG_SWIFT_STORAGE_HOSTS"]):
host = device['host'] host = device['host']
devicename = device['device_name'] devicename = device['device_name']
zone = device['zone'] zone = device['zone']