Skip to content
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

fix(ISOSR): type accepts 'nfs_iso' not 'nfs' as the docs claim #661

Merged
merged 2 commits into from
Dec 11, 2023
Merged

fix(ISOSR): type accepts 'nfs_iso' not 'nfs' as the docs claim #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2b2a2f
fix(ISOSR): type accepts 'nfs_iso' not 'nfs' as the docs claim
edwintorok Dec 7, 2023
a7d8d1b
Add additonal ISO SR configuration options
MarkSymsCtx Dec 8, 2023
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
17 changes: 11 additions & 6 deletions drivers/ISOSR.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,17 @@
CAPABILITIES = ["VDI_CREATE", "VDI_DELETE", "VDI_ATTACH", "VDI_DETACH",
"SR_SCAN", "SR_ATTACH", "SR_DETACH"]

CONFIGURATION = \
[['location', 'path to mount (required) (e.g. server:/path)'],
['options',
'extra options to pass to mount (deprecated) (e.g. \'-o ro\')'],
['type', 'cifs or nfs'],
nfs.NFS_VERSION]
CONFIGURATION = [
['location', 'path to mount (required) (e.g. server:/path)'],
['options',
'extra options to pass to mount (e.g. \'-o ro\')'],
['type', 'cifs (SMB) or nfs_iso'],
nfs.NFS_VERSION,
['vers', 'SMB version, default version 3'],
['username', r'Username to authenticate to SMB share with, can be domain\username'],
['cifspassword_secret', 'Secret ID containing the password to authenticate to SMB'],
['cifspassword', 'Password to authenticate to SMB, (deprecated see cifspassword_secret)']
]

DRIVER_INFO = {
'name': 'ISO',
Expand Down
2 changes: 1 addition & 1 deletion drivers/nfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
DEFAULT_NFSVERSION = '3'

NFS_VERSION = [
'nfsversion', 'for type=nfs, NFS protocol version - 3, 4, 4.0, 4.1']
'nfsversion', 'NFS protocol version - 3, 4, 4.0, 4.1']

NFS_SERVICE_WAIT = 30
NFS_SERVICE_RETRY = 6
Expand Down