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

Updated for new Proxmox 5.2 

- Updated patch files for Proxmox 5.2 changes
- Updated README for some newer instructions.
- Added change to the API viewer so the freenas_user and
freenas_password show on the 'edit' dialog.
This commit is contained in:
Kevin Scott Adams 2018-05-24 10:57:59 -04:00
parent 6510170216
commit 5be1c4ecfa
2 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
README
View File

@ -1,15 +1,25 @@
patch files:
/usr/share/pve-manager/js/pvemanagerlib.js
/usr/share/perl5/PVE/Storage/ZFSPlugin.pm
FreeNAS ZFS over iSCSI interface
copy
/usr/share/perl5/REST
/usr/share/perl5/PVE/Storage/LunCmd/FreeNAS.pm
Please be aware that this enhancment uses the FreeNAS API's and NOT the ssh/scp
like the other interface provide.
UPDATE FreeNAS username and password in FreeNAS.pm
1) First use the following commands to patch the needed files forthe FreeNAS Interface
patch /usr/share/pve-manager/js/pvemanagerlib.js < pve-manager/js/pvemanagerlib.js.patch
patch /usr/share/perl5/PVE/Storage/ZFSPlugin.pm < perl5/PVE/Storage/ZFSPlugin.pm.patch
patch /usr/share/pve-docs/api-viewer/apidoc.js < pve-docs/api-viewer/apidoc.js.patch
2) Use the following commands to copy the needed files for the FreeNAS
mkdir -p /usr/share/perl5/REST
cp perl5/REST/Client.pm
cp perl5/PVE/Storage/LunCmd/FreeNAS.pm /usr/share/perl5/PVE/Storage/LunCmd/FreeNAS.pm
in /usr/bin/pvedaemon remove -T from perl
3) Edit /usr/bin/pvedaemon and remove the '-T' from the perl command line.
vi /usr/bin/pvedaemon
systemctl restart pvedaemon
4) Execute the following at a console command prompt to active the above
systemctl restart pvedaemon
5) Either goto the URL for the Proxmox GUI in your favorite browser
or
If you are already logged in via the GUI just refresh your browser to receive
the new Javascript code.

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

@ -1,6 +1,6 @@
--- pvemanagerlib.js.orig 2018-04-17 09:46:23.137417873 -0400
+++ pvemanagerlib.js 2018-04-18 14:09:30.858616030 -0400
@@ -5188,6 +5188,7 @@
--- /usr/share/pve-manager/js/pvemanagerlib.js.orig 2018-05-23 16:53:17.014250092 -0400
+++ /usr/share/pve-manager/js/pvemanagerlib.js 2018-05-23 16:58:22.848825697 -0400
@@ -5303,6 +5303,7 @@
alias: ['widget.pveiScsiProviderSelector'],
comboItems: [
['comstar', 'Comstar'],
@ -8,30 +8,35 @@
[ 'istgt', 'istgt'],
[ 'iet', 'IET']
]
@@ -26079,6 +26080,13 @@
@@ -27145,7 +27146,14 @@
value: '',
fieldLabel: gettext('Target group'),
allowBlank: true
- }
+ },
+ {
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
+ name: 'freenas_user',
+ value: '',
+ fieldLabel: gettext('FreeNAS User'),
+ allowBlank: true
}
+ {
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
+ name: 'freenas_user',
+ value: '',
+ fieldLabel: gettext('FreeNAS User'),
+ allowBlank: true
+ }
];
@@ -26110,6 +26118,13 @@
me.column2 = [
@@ -27176,7 +27184,14 @@
value: '',
fieldLabel: gettext('Host group'),
allowBlank: true
- }
+ },
+ {
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
+ name: 'freenas_password',
+ value: '',
+ fieldLabel: gettext('FreeNAS Password'),
+ allowBlank: true
}
+ {
+ xtype: me.isCreate ? 'textfield' : 'displayfield',
+ name: 'freenas_password',
+ value: '',
+ fieldLabel: gettext('FreeNAS Password'),
+ allowBlank: true
+ }
];
me.callParent();