diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-29 09:21:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-29 09:21:39 +0000 |
| commit | b6b37f4cec3e4e9b442f58fa86486fa809098b0b (patch) | |
| tree | 37a4337d9a9cc0558b46e15deefb0f4fd086b8f4 /docker | |
| parent | 834b5eff5c1e3768fdc829128cae0b0955420bcd (diff) | |
| parent | d2ad5f290aad90223331a622a0f546396a2cf611 (diff) | |
| download | kolla-b6b37f4cec3e4e9b442f58fa86486fa809098b0b.tar.gz kolla-b6b37f4cec3e4e9b442f58fa86486fa809098b0b.zip | |
Merge "Remove meaningless char in regexp of find_disks.py file"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/find_disks.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/kolla-toolbox/find_disks.py b/docker/kolla-toolbox/find_disks.py index e72dcc6fb..dcb6e812b 100644 --- a/docker/kolla-toolbox/find_disks.py +++ b/docker/kolla-toolbox/find_disks.py @@ -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 |