From eba38fa4b2fca54fa22d1dee32b9fc63b0a226df Mon Sep 17 00:00:00 2001 From: Stefan Sterz Date: Tue, 25 Oct 2022 10:10:46 +0200 Subject: [PATCH] ui: only allow rbd pools to be added as rbd storage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit previously the ui would allow adding all pools (even the default ceph-mon pools) as storage. this could lead to issues when users did use these pools as storage (e.g.: vms missing their disks after a migration). hence, restrict the pool selector to rbd pools. fails gracefully by reverting to the previous behavior if a pool has no application assigned to it. Signed-off-by: Stefan Sterz Tested-By:  Aaron Lauterer  --- www/manager6/form/CephPoolSelector.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/www/manager6/form/CephPoolSelector.js b/www/manager6/form/CephPoolSelector.js index 5b96398d..e8197077 100644 --- a/www/manager6/form/CephPoolSelector.js +++ b/www/manager6/form/CephPoolSelector.js @@ -15,9 +15,15 @@ Ext.define('PVE.form.CephPoolSelector', { throw "no nodename given"; } + let onlyRBDPools = ({ data }) => + !data?.application_metadata || !!data?.application_metadata?.rbd; + var store = Ext.create('Ext.data.Store', { fields: ['name'], sorters: 'name', + filters: [ + onlyRBDPools, + ], proxy: { type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/ceph/pools', @@ -32,8 +38,10 @@ Ext.define('PVE.form.CephPoolSelector', { store.load({ callback: function(rec, op, success) { - if (success && rec.length > 0) { - me.select(rec[0]); + let filteredRec = rec.filter(onlyRBDPools); + + if (success && filteredRec.length > 0) { + me.select(filteredRec[0]); } }, });