openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove meaningless char in regexp of find_disks.py file"

Browse Source
This commit is contained in:
Jenkins 2016-03-29 09:21:39 +00:00 committed by Gerrit Code Review
commit b6b37f4cec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/kolla-toolbox/find_disks.py
View File

@ -99,7 +99,7 @@ def extract_disk_info(ct, dev, name):
kwargs['device'] = dev.find_parent('block').device_node
kwargs['partition'] = dev.device_node
kwargs['partition_num'] = \
re.sub(r'.*[^\d$]', '', dev.device_node)
re.sub(r'.*[^\d]', '', dev.device_node)
if is_dev_matched_by_name(dev, name, 'strict'):
kwargs['external_journal'] = False
kwargs['journal'] = dev.device_node[:-1] + '2'
@ -113,7 +113,7 @@ def extract_disk_info(ct, dev, name):
kwargs['journal_device'] = \
journal.find_parent('block').device_node
kwargs['journal_num'] = \
re.sub(r'.*[^\d$]', '', journal.device_node)
re.sub(r'.*[^\d]', '', journal.device_node)
break
if 'journal' not in kwargs:
# NOTE(SamYaple): Journal not found, not returning info