openstack/kolla-ansible
Code Issues Proposed changes

Remove meaningless char in regexp of find_disks.py file

Browse Source 
the $ char is useless and not needed.

TrivialFix

Change-Id: I18df48ca86badadf6ec18757c17ed32222ead30a
This commit is contained in:
Jeffrey Zhang 2016-03-25 22:25:39 +08:00
parent bd5d38ef3c
commit d2ad5f290a
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['device'] = dev.find_parent('block').device_node
kwargs['partition'] = dev.device_node kwargs['partition'] = dev.device_node
kwargs['partition_num'] = \ 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'): if is_dev_matched_by_name(dev, name, 'strict'):
kwargs['external_journal'] = False kwargs['external_journal'] = False
kwargs['journal'] = dev.device_node[:-1] + '2' kwargs['journal'] = dev.device_node[:-1] + '2'
@ -113,7 +113,7 @@ def extract_disk_info(ct, dev, name):
kwargs['journal_device'] = \ kwargs['journal_device'] = \
journal.find_parent('block').device_node journal.find_parent('block').device_node
kwargs['journal_num'] = \ kwargs['journal_num'] = \
re.sub(r'.*[^\d$]', '', journal.device_node) re.sub(r'.*[^\d]', '', journal.device_node)
break break
if 'journal' not in kwargs: if 'journal' not in kwargs:
# NOTE(SamYaple): Journal not found, not returning info # NOTE(SamYaple): Journal not found, not returning info