Skip to content

Fix mount_ext to work on centos 6 / python 2.6 #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clarkperkins wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix mount_ext to work on centos 6 / python 2.6 #272

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions stackdio/salt/core_states/_modules/mount_ext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,16 @@ def find_ebs_device(device):
if device.startswith('/dev/sd'):
if os.path.exists('/dev/xvda'):
new_device_letter = device[7]
device_pattern = '/dev/xvd{}{}'
device_pattern = '/dev/xvd{0}{1}'
elif os.path.exists('/dev/xvde'):
# Some systems start with /dev/xvde instead of /dev/xvda,
# so we need to add 4 to the current letter
new_device_letter = chr(ord(device[7]) + 4)
device_pattern = '/dev/xvd{}{}'
device_pattern = '/dev/xvd{0}{1}'
elif os.path.exists('/dev/nvme0n1'):
# Some devices use the NVMe naming scheme, so we need to convert the letter to a number
new_device_letter = ord(device[7]) - ord('a')
device_pattern = '/dev/nvme{}n1{}'
device_pattern = '/dev/nvme{0}n1{1}'
else:
return None

Expand Down