ui: rbd: cephfs: add keyring/secret field for external clusters

Manual switching of xtype because binding 'hidden' does not work with
pmxDisplayEditField.

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>

diff --git a/www/manager6/storage/CephFSEdit.js b/www/manager6/storage/CephFSEdit.js
index 92fdfe632471aea0e877c7150e2736a7bc185d37..b851f2cc1f17978d9fd7a26e3a3cefdbdac5d09b 100644 (file)
--- a/www/manager6/storage/CephFSEdit.js
+++ b/www/manager6/storage/CephFSEdit.js
@@ -101,20 +101,33 @@ Ext.define('PVE.storage.CephFSInputPanel', {
            },
        ];
 
-       me.columnB = [{
-           xtype: 'proxmoxcheckbox',
-           name: 'pveceph',
-           reference: 'pvecephRef',
-           bind: {
-               disabled: '{!pvecephPossible}',
-               value: '{pveceph}',
+       me.columnB = [
+           {
+               xtype: me.isCreate ? 'textfield' : 'displayfield',
+               name: 'keyring',
+               fieldLabel: 'Secret',
+               value: me.isCreate ? '' : '***********',
+               allowBlank: false,
+               bind: {
+                   hidden: '{pveceph}',
+                   disabled: '{pveceph}',
+               },
+           },
+           {
+               xtype: 'proxmoxcheckbox',
+               name: 'pveceph',
+               reference: 'pvecephRef',
+               bind: {
+                   disabled: '{!pvecephPossible}',
+                   value: '{pveceph}',
+               },
+               checked: true,
+               uncheckedValue: 0,
+               submitValue: false,
+               hidden: !me.isCreate,
+               boxLabel: gettext('Use Proxmox VE managed hyper-converged cephFS'),
            },
-           checked: true,
-           uncheckedValue: 0,
-           submitValue: false,
-           hidden: !me.isCreate,
-           boxLabel: gettext('Use Proxmox VE managed hyper-converged cephFS'),
-       }];
+       ];
 
        me.callParent();
     },

diff --git a/www/manager6/storage/RBDEdit.js b/www/manager6/storage/RBDEdit.js
index 35568b9854e8d04d6520f804c886c80d0475af3d..15fc13047952624d3e3a1a6c20f9fed65c223a1e 100644 (file)
--- a/www/manager6/storage/RBDEdit.js
+++ b/www/manager6/storage/RBDEdit.js
@@ -201,6 +201,17 @@ Ext.define('PVE.storage.RBDInputPanel', {
        ];
 
        me.columnB = [
+           {
+               xtype: me.isCreate ? 'textarea' : 'displayfield',
+               name: 'keyring',
+               fieldLabel: 'Keyring',
+               value: me.isCreate ? '' : '***********',
+               allowBlank: false,
+               bind: {
+                   hidden: '{pveceph}',
+                   disabled: '{pveceph}',
+               },
+           },
            {
                xtype: 'proxmoxcheckbox',
                name: 'pveceph',