[pve-devel] [PATCH manager 11/12] api: ceph: osd: create: rename size parameters

Fabian Ebner f.ebner at proxmox.com
Fri Jun 4 15:49:45 CEST 2021


Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---
 PVE/API2/Ceph/OSD.pm     | 8 ++------
 www/manager6/ceph/OSD.js | 8 ++++----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/PVE/API2/Ceph/OSD.pm b/PVE/API2/Ceph/OSD.pm
index 27e0642c..79548b2f 100644
--- a/PVE/API2/Ceph/OSD.pm
+++ b/PVE/API2/Ceph/OSD.pm
@@ -223,7 +223,7 @@ __PACKAGE__->register_method ({
 		optional => 1,
 		type => 'string',
 	    },
-	    db_size => {
+	    db_dev_size => {
 		description => "Size in GiB for block.db.",
 		verbose_description => "If a block.db is requested but the size is not given, ".
 		    "will be automatically selected by: bluestore_block_db_size from the ".
@@ -241,7 +241,7 @@ __PACKAGE__->register_method ({
 		optional => 1,
 		type => 'string',
 	    },
-	    wal_size => {
+	    wal_dev_size => {
 		description => "Size in GiB for block.wal.",
 		verbose_description => "If a block.wal is requested but the size is not given, ".
 		    "will be automatically selected by: bluestore_block_wal_size from the ".
@@ -300,10 +300,6 @@ __PACKAGE__->register_method ({
 	    }
 	}
 
-	# FIXME: rename params on next API compatibillity change (7.0)
-	$param->{wal_dev_size} = delete $param->{wal_size};
-	$param->{db_dev_size} = delete $param->{db_size};
-
 	for my $type ( qw(dev db_dev wal_dev) ) {
 	    next if !$param->{$type};
 
diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js
index 13cd2fc5..aea38d6c 100644
--- a/www/manager6/ceph/OSD.js
+++ b/www/manager6/ceph/OSD.js
@@ -55,13 +55,13 @@ Ext.define('PVE.CephCreateOsd', {
 			    emptyText: 'use OSD disk',
 			    listeners: {
 				change: function(field, val) {
-				    me.down('field[name=db_size]').setDisabled(!val);
+				    me.down('field[name=db_dev_size]').setDisabled(!val);
 				},
 			    },
 			},
 			{
 			    xtype: 'numberfield',
-			    name: 'db_size',
+			    name: 'db_dev_size',
 			    fieldLabel: gettext('DB size') + ' (GiB)',
 			    minValue: 1,
 			    maxValue: 128*1024,
@@ -108,13 +108,13 @@ Ext.define('PVE.CephCreateOsd', {
 			    emptyText: 'use OSD/DB disk',
 			    listeners: {
 				change: function(field, val) {
-				    me.down('field[name=wal_size]').setDisabled(!val);
+				    me.down('field[name=wal_dev_size]').setDisabled(!val);
 				},
 			    },
 			},
 			{
 			    xtype: 'numberfield',
-			    name: 'wal_size',
+			    name: 'wal_dev_size',
 			    fieldLabel: gettext('WAL size') + ' (GiB)',
 			    minValue: 0.5,
 			    maxValue: 128*1024,
-- 
2.30.2






More information about the pve-devel mailing list