public_git
/
freenas-proxmox
mirror of https://github.com/TheGrandWazoo/freenas-proxmox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update to latest Proxmox VE update 

- Update ZFSPlugin.pm to reflect 'libpve-storage-perl: 5.0-38'
- Update pvemanager.js to reflect 'pve-manager: 5.3-11'
- Update pve-docs.js to reflect 'pve-docs: 5.3-3'
This commit is contained in:
Kevin Scott Adams 2019-02-26 21:28:15 -05:00
parent 54d27aa58a
commit ea73c4f7c9
6 changed files with 433 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
perl5/PVE/Storage/ZFSPlugin-5.0-38_1.pm.patch Normal file
View File

@ -0,0 +1,147 @@
--- ZFSPlugin.pm.orig 2019-02-07 09:14:12.000000000 -0500
+++ ZFSPlugin.pm 2019-02-26 20:53:29.096598801 -0500
@@ -10,6 +10,7 @@
use base qw(PVE::Storage::ZFSPoolPlugin);
use PVE::Storage::LunCmd::Comstar;
+use PVE::Storage::LunCmd::FreeNAS;
use PVE::Storage::LunCmd::Istgt;
use PVE::Storage::LunCmd::Iet;
use PVE::Storage::LunCmd::LIO;
@@ -26,13 +27,14 @@
modify_lu => 1,
add_view => 1,
list_view => 1,
+ list_extent => 1,
list_lu => 1,
};
my $zfs_unknown_scsi_provider = sub {
my ($provider) = @_;
- die "$provider: unknown iscsi provider. Available [comstar, istgt, iet, LIO]";
+ die "$provider: unknown iscsi provider. Available [comstar, freenas, istgt, iet, LIO]";
};
my $zfs_get_base = sub {
@@ -40,6 +42,8 @@
if ($scfg->{iscsiprovider} eq 'comstar') {
return PVE::Storage::LunCmd::Comstar::get_base;
+ } elsif ($scfg->{iscsiprovider} eq 'freenas') {
+ return PVE::Storage::LunCmd::FreeNAS::get_base;
} elsif ($scfg->{iscsiprovider} eq 'istgt') {
return PVE::Storage::LunCmd::Istgt::get_base;
} elsif ($scfg->{iscsiprovider} eq 'iet') {
@@ -62,6 +66,8 @@
if ($lun_cmds->{$method}) {
if ($scfg->{iscsiprovider} eq 'comstar') {
$msg = PVE::Storage::LunCmd::Comstar::run_lun_command($scfg, $timeout, $method, @params);
+ } elsif ($scfg->{iscsiprovider} eq 'freenas') {
+ $msg = PVE::Storage::LunCmd::FreeNAS::run_lun_command($scfg, $timeout, $method, @params);
} elsif ($scfg->{iscsiprovider} eq 'istgt') {
$msg = PVE::Storage::LunCmd::Istgt::run_lun_command($scfg, $timeout, $method, @params);
} elsif ($scfg->{iscsiprovider} eq 'iet') {
@@ -160,6 +166,15 @@
return $class->zfs_request($scfg, undef, 'list_view', $guid);
}
+# Part of the multipath enhancement
+sub zfs_get_wwid_number {
+ my ($class, $scfg, $guid) = @_;
+
+ die "could not find lun_number for guid $guid" if !$guid;
+
+ return $class->zfs_request($scfg, undef, 'list_extent', $guid);
+}
+
# Configuration
sub type {
@@ -178,6 +193,24 @@
description => "iscsi provider",
type => 'string',
},
+ # This is for FreeNAS iscsi and API intergration
+ # And some enhancements asked by the community
+ freenas_user => {
+ description => "FreeNAS API Username",
+ type => 'string',
+ },
+ freenas_password => {
+ description => "FreeNAS API Password",
+ type => 'string',
+ },
+ freenas_use_ssl => {
+ description => "FreeNAS API access via SSL",
+ type => 'boolean',
+ },
+ freenas_apiv4_host => {
+ description => "FreeNAS API Host",
+ type => 'string',
+ },
# this will disable write caching on comstar and istgt.
# it is not implemented for iet. iet blockio always operates with
# writethrough caching when not in readonly mode
@@ -205,14 +238,18 @@
nodes => { optional => 1 },
disable => { optional => 1 },
portal => { fixed => 1 },
- target => { fixed => 1 },
- pool => { fixed => 1 },
+ target => { fixed => 0 },
+ pool => { fixed => 0 },
blocksize => { fixed => 1 },
iscsiprovider => { fixed => 1 },
nowritecache => { optional => 1 },
sparse => { optional => 1 },
comstar_hg => { optional => 1 },
comstar_tg => { optional => 1 },
+ freenas_user => { optional => 1 },
+ freenas_password => { optional => 1 },
+ freenas_use_ssl => { optional => 1 },
+ freenas_apiv4_host => { optional => 1 },
lio_tpg => { optional => 1 },
content => { optional => 1 },
bwlimit => { optional => 1 },
@@ -237,6 +274,40 @@
my $path = "iscsi://$portal/$target/$lun";
+ # Multipath enhancement
+ eval {
+ my $wwid = $class->zfs_get_wwid_number($scfg, $guid);
+# syslog(info,"JD: path get_lun_number guid $guid");
+
+ if ($wwid =~ /^([-\@\w.]+)$/) {
+ $wwid = $1; # $data now untainted
+ } else {
+ die "Bad data in '$wwid'"; # log this somewhere
+ }
+ my $wwid_end = substr $wwid, 16;
+
+ my $mapper = '';
+ sleep 3;
+ run_command("iscsiadm -m session --rescan");
+ sleep 3;
+ my $line = `multipath -ll | grep \"$wwid_end\"`;
+ my ($mapper_device) = split(' ', $line);
+ $mapper_device = "" unless $mapper_device;
+ $mapper .= $mapper_device;
+
+ if ($mapper =~ /^([-\@\w.]+)$/) {
+ $mapper = $1; # $data now untainted
+ } else {
+ $mapper = '';
+ }
+
+# syslog(info,"Multipath mapper found: $mapper\n");
+ if ($mapper ne "") {
+ $path = "/dev/mapper/$mapper";
+ sleep 5;
+ }
+ };
+
return ($path, $vmid, $vtype);
}

4
perl5/PVE/Storage/ZFSPlugin.pm.patch
View File

@ -1,5 +1,5 @@
--- ZFSPlugin-5.0-34.pm 2018-12-21 12:52:21.764194866 -0500 --- ZFSPlugin.pm.orig 2019-02-07 09:14:12.000000000 -0500
+++ ZFSPlugin.pm 2018-12-21 12:53:08.663665081 -0500 +++ ZFSPlugin.pm 2019-02-26 20:53:29.096598801 -0500
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
use base qw(PVE::Storage::ZFSPoolPlugin); use base qw(PVE::Storage::ZFSPoolPlugin);

79
pve-docs/api-viewer/apidoc-5.3-3_1.js.patch Normal file
View File

@ -0,0 +1,79 @@
--- apidoc.js.orig 2019-02-20 06:20:05.000000000 -0500
+++ apidoc.js 2019-02-26 20:51:26.857204965 -0500
@@ -33709,6 +33709,31 @@
"type" : "string",
"typetext" : "<string>"
},
+ "freenas_user" : {
+ "description" : "FreeNAS user for API access",
+ "optional" : 1,
+ "type" : "string",
+ "typetext" : "<string>"
+ },
+ "freenas_password" : {
+ "description" : "FreeNAS password for API access",
+ "optional" : 1,
+ "type" : "string",
+ "typetext" : "<string>"
+ },
+ "freenas_use_ssl" : {
+ "description" : "FreeNAS API access via SSL",
+ "optional" : 1,
+ "type" : "boolean",
+ "typetext" : "<boolean>"
+ },
+ "freenas_apiv4_host" : {
+ "description" : "FreeNAS API Host via IPv4",
+ "format" : "address",
+ "optional" : 1,
+ "type" : "string",
+ "typetext" : "<string>"
+ },
"fuse" : {
"description" : "Mount CephFS through FUSE.",
"optional" : 1,
@@ -33865,6 +33890,12 @@
"type" : "boolean",
"typetext" : "<boolean>"
},
+ "target" : {
+ "description" : "iSCSI target.",
+ "optional" : 1,
+ "type" : "string",
+ "typetext" : "<string>"
+ },
"transport" : {
"description" : "Gluster transport: tcp or rdma",
"enum" : [
@@ -34071,6 +34102,31 @@
"optional" : 1,
"type" : "string",
"typetext" : "<string>"
+ },
+ "freenas_user" : {
+ "description" : "FreeNAS user for API access",
+ "optional" : 1,
+ "type" : "string",
+ "typetext" : "<string>"
+ },
+ "freenas_password" : {
+ "description" : "FreeNAS password for API access",
+ "optional" : 1,
+ "type" : "string",
+ "typetext" : "<string>"
+ },
+ "freenas_use_ssl" : {
+ "description" : "FreeNAS API access via SSL",
+ "optional" : 1,
+ "type" : "boolean",
+ "typetext" : "<boolean>"
+ },
+ "freenas_apiv4_host" : {
+ "description" : "FreeNAS API Host via IPv4",
+ "format" : "address",
+ "optional" : 1,
+ "type" : "string",
+ "typetext" : "<string>"
},
"fuse" : {
"description" : "Mount CephFS through FUSE.",

10
pve-docs/api-viewer/apidoc.js.patch
View File

@ -1,6 +1,6 @@
--- apidoc-5.3-1.js 2018-12-21 12:46:55.459865478 -0500 --- apidoc.js.orig 2019-02-20 06:20:05.000000000 -0500
+++ apidoc.js 2018-12-06 15:50:21.487987807 -0500 +++ apidoc.js 2019-02-26 20:51:26.857204965 -0500
@@ -33477,6 +33477,31 @@ @@ -33709,6 +33709,31 @@
"type" : "string", "type" : "string",
"typetext" : "<string>" "typetext" : "<string>"
}, },
@ -32,7 +32,7 @@
"fuse" : { "fuse" : {
"description" : "Mount CephFS through FUSE.", "description" : "Mount CephFS through FUSE.",
"optional" : 1, "optional" : 1,
@@ -33633,6 +33658,12 @@ @@ -33865,6 +33890,12 @@
"type" : "boolean", "type" : "boolean",
"typetext" : "<boolean>" "typetext" : "<boolean>"
}, },
@ -45,7 +45,7 @@
"transport" : { "transport" : {
"description" : "Gluster transport: tcp or rdma", "description" : "Gluster transport: tcp or rdma",
"enum" : [ "enum" : [
@@ -33840,6 +33871,31 @@ @@ -34071,6 +34102,31 @@
"optional" : 1, "optional" : 1,
"type" : "string", "type" : "string",
"typetext" : "<string>" "typetext" : "<string>"

189
pve-manager/js/pvemanagerlib-5.3-11_1.js.patch Normal file
View File

@ -0,0 +1,189 @@
--- pvemanagerlib.js.orig 2019-02-20 13:40:43.000000000 -0500
+++ pvemanagerlib.js 2019-02-26 20:49:41.032327478 -0500
@@ -5920,6 +5920,7 @@
alias: ['widget.pveiScsiProviderSelector'],
comboItems: [
['comstar', 'Comstar'],
+ ['freenas', 'FreeNAS-API'],
[ 'istgt', 'istgt'],
[ 'iet', 'IET'],
[ 'LIO', 'LIO']
@@ -30182,6 +30183,7 @@
data: {
isLIO: false,
isComstar: true,
+ isFreeNAS: false,
hasWriteCacheOption: true
}
},
@@ -30194,10 +30196,26 @@
}
},
changeISCSIProvider: function(f, newVal, oldVal) {
+ var me = this;
var vm = this.getViewModel();
vm.set('isLIO', newVal === 'LIO');
vm.set('isComstar', newVal === 'comstar');
- vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'istgt');
+ vm.set('isFreeNAS', newVal === 'freenas');
+ vm.set('hasWriteCacheOption', newVal === 'comstar' || newVal === 'freenas' || newVal === 'istgt');
+ if (newVal !== 'freenas') {
+ me.lookupReference('freenas_use_ssl_field').setValue(false);
+ me.lookupReference('freenas_apiv4_host_field').setValue('');
+ me.lookupReference('freenas_user_field').setValue('');
+ me.lookupReference('freenas_user_field').allowBlank = true;
+ me.lookupReference('freenas_password_field').setValue('');
+ me.lookupReference('freenas_password_field').allowBlank = true;
+ me.lookupReference('freenas_confirmpw_field').setValue('');
+ me.lookupReference('freenas_confirmpw_field').allowBlank = true;
+ } else {
+ me.lookupReference('freenas_user_field').allowBlank = false;
+ me.lookupReference('freenas_password_field').allowBlank = false;
+ me.lookupReference('freenas_confirmpw_field').allowBlank = false;
+ }
}
},
@@ -30215,6 +30233,7 @@
},
setValues: function diff(values) {
+ values.freenas_confirmpw = values.freenas_password;
values.writecache = values.nowritecache ? 0 : 1;
this.callParent([values]);
},
@@ -30231,7 +30250,7 @@
allowBlank: false
},
{
- xtype: me.isCreate ? 'textfield' : 'displayfield',
+ xtype: 'textfield',
name: 'pool',
value: '',
fieldLabel: gettext('Pool'),
@@ -30241,11 +30260,11 @@
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'blocksize',
value: '4k',
- fieldLabel: gettext('Block Size'),
+ fieldLabel: gettext('ZFS Block Size'),
allowBlank: false
},
{
- xtype: me.isCreate ? 'textfield' : 'displayfield',
+ xtype: 'textfield',
name: 'target',
value: '',
fieldLabel: gettext('Target'),
@@ -30256,8 +30275,33 @@
name: 'comstar_tg',
value: '',
fieldLabel: gettext('Target group'),
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
+ bind: {
+ hidden: '{!isComstar}'
+ },
allowBlank: true
+ },
+ {
+ xtype: 'proxmoxcheckbox',
+ name: 'freenas_use_ssl',
+ reference: 'freenas_use_ssl_field',
+ inputId: 'freenas_use_ssl_field',
+ checked: false,
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ uncheckedValue: 0,
+ fieldLabel: gettext('API use SSL')
+ },
+ {
+ xtype: 'textfield',
+ name: 'freenas_user',
+ reference: 'freenas_user_field',
+ inputId: 'freenas_user_field',
+ value: '',
+ fieldLabel: gettext('API Username'),
+ bind: {
+ hidden: '{!isFreeNAS}'
+ }
}
];
@@ -30288,7 +30332,9 @@
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'comstar_hg',
value: '',
- bind: me.isCreate ? { disabled: '{!isComstar}' } : { hidden: '{!isComstar}' },
+ bind: {
+ hidden: '{!isComstar}'
+ },
fieldLabel: gettext('Host group'),
allowBlank: true
},
@@ -30296,9 +30342,62 @@
xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'lio_tpg',
value: '',
- bind: me.isCreate ? { disabled: '{!isLIO}' } : { hidden: '{!isLIO}' },
- allowBlank: false,
- fieldLabel: gettext('Target portal group')
+ bind: {
+ hidden: '{!isLIO}'
+ },
+ fieldLabel: gettext('Target portal group'),
+ allowBlank: true
+ },
+ {
+ xtype: 'proxmoxtextfield',
+ name: 'freenas_apiv4_host',
+ reference: 'freenas_apiv4_host_field',
+ value: '',
+ editable: true,
+ emptyText: Proxmox.Utils.noneText,
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ fieldLabel: gettext('API IPv4 Host'),
+ },
+ {
+ xtype: 'proxmoxtextfield',
+ name: 'freenas_password',
+ reference: 'freenas_password_field',
+ inputType: me.isCreate ? '' : 'password',
+ value: '',
+ editable: true,
+ emptyText: Proxmox.Utils.noneText,
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ fieldLabel: gettext('API Password'),
+ change: function(f, value) {
+ if (f.rendered) {
+ f.up().down('field[name=freenas_confirmpw]').validate();
+ }
+ }
+ },
+ {
+ xtype: 'proxmoxtextfield',
+ name: 'freenas_confirmpw',
+ reference: 'freenas_confirmpw_field',
+ inputType: me.isCreate ? '' : 'password',
+ value: '',
+ editable: true,
+ submitValue: false,
+ emptyText: Proxmox.Utils.noneText,
+ bind: {
+ hidden: '{!isFreeNAS}'
+ },
+ fieldLabel: gettext('Confirm Password'),
+ validator: function(value) {
+ var pw = this.up().down('field[name=freenas_password]').getValue();
+ if (pw !== value) {
+ return "Passwords do not match!";
+ }
+ return true;
+ }
}
];

22
pve-manager/js/pvemanagerlib.js.patch
View File

@ -1,6 +1,6 @@
--- pvemanagerlib.js.orig 2019-01-11 04:23:42.000000000 -0500 --- pvemanagerlib.js.orig 2019-02-20 13:40:43.000000000 -0500
+++ pvemanagerlib.js 2019-02-05 07:30:18.168655803 -0500 +++ pvemanagerlib.js 2019-02-26 20:49:41.032327478 -0500
@@ -5894,6 +5894,7 @@ @@ -5920,6 +5920,7 @@
alias: ['widget.pveiScsiProviderSelector'], alias: ['widget.pveiScsiProviderSelector'],
comboItems: [ comboItems: [
['comstar', 'Comstar'], ['comstar', 'Comstar'],
@ -8,7 +8,7 @@
[ 'istgt', 'istgt'], [ 'istgt', 'istgt'],
[ 'iet', 'IET'], [ 'iet', 'IET'],
[ 'LIO', 'LIO'] [ 'LIO', 'LIO']
@@ -30085,6 +30086,7 @@ @@ -30182,6 +30183,7 @@
data: { data: {
isLIO: false, isLIO: false,
isComstar: true, isComstar: true,
@ -16,7 +16,7 @@
hasWriteCacheOption: true hasWriteCacheOption: true
} }
}, },
@@ -30097,10 +30099,26 @@ @@ -30194,10 +30196,26 @@
} }
}, },
changeISCSIProvider: function(f, newVal, oldVal) { changeISCSIProvider: function(f, newVal, oldVal) {
@ -44,7 +44,7 @@
} }
}, },
@@ -30118,6 +30136,7 @@ @@ -30215,6 +30233,7 @@
}, },
setValues: function diff(values) { setValues: function diff(values) {
@ -52,7 +52,7 @@
values.writecache = values.nowritecache ? 0 : 1; values.writecache = values.nowritecache ? 0 : 1;
this.callParent([values]); this.callParent([values]);
}, },
@@ -30134,7 +30153,7 @@ @@ -30231,7 +30250,7 @@
allowBlank: false allowBlank: false
}, },
{ {
@ -61,7 +61,7 @@
name: 'pool', name: 'pool',
value: '', value: '',
fieldLabel: gettext('Pool'), fieldLabel: gettext('Pool'),
@@ -30144,11 +30163,11 @@ @@ -30241,11 +30260,11 @@
xtype: me.isCreate ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'blocksize', name: 'blocksize',
value: '4k', value: '4k',
@ -75,7 +75,7 @@
name: 'target', name: 'target',
value: '', value: '',
fieldLabel: gettext('Target'), fieldLabel: gettext('Target'),
@@ -30159,8 +30178,33 @@ @@ -30256,8 +30275,33 @@
name: 'comstar_tg', name: 'comstar_tg',
value: '', value: '',
fieldLabel: gettext('Target group'), fieldLabel: gettext('Target group'),
@ -110,7 +110,7 @@
} }
]; ];
@@ -30191,7 +30235,9 @@ @@ -30288,7 +30332,9 @@
xtype: me.isCreate ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'comstar_hg', name: 'comstar_hg',
value: '', value: '',
@ -121,7 +121,7 @@
fieldLabel: gettext('Host group'), fieldLabel: gettext('Host group'),
allowBlank: true allowBlank: true
}, },
@@ -30199,9 +30245,62 @@ @@ -30296,9 +30342,62 @@
xtype: me.isCreate ? 'textfield' : 'displayfield', xtype: me.isCreate ? 'textfield' : 'displayfield',
name: 'lio_tpg', name: 'lio_tpg',
value: '', value: '',