[pve-devel] [PATCH manager] fix #2389: ceph wizard showing network of target node

Mira Limbeck m.limbeck at proxmox.com
Fri Oct 4 15:07:46 CEST 2019


On 10/4/19 3:03 PM, Thomas Lamprecht wrote:
> On 10/4/19 11:29 AM, Mira Limbeck wrote:
>> Before this patch the wizard shows the available networks for the node
>> one is connected to, not the actual target node where ceph is
>> configured. This patch changes this to access the network information of
>> the target node instead of the local one.
>> It could be that not every node in the cluster is part of the ceph
>> cluster (and the same network) which makes this useful.
>>
>> Signed-off-by: Mira Limbeck <m.limbeck at proxmox.com>
>> ---
>>   www/manager6/ceph/CephInstallWizard.js | 8 +++++++-
>>   1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/www/manager6/ceph/CephInstallWizard.js b/www/manager6/ceph/CephInstallWizard.js
>> index 2613a1fa..166f81b2 100644
>> --- a/www/manager6/ceph/CephInstallWizard.js
>> +++ b/www/manager6/ceph/CephInstallWizard.js
>> @@ -189,6 +189,9 @@ Ext.define('PVE.ceph.CephInstallWizard', {
>>   			fieldLabel: 'Public Network IP/CIDR',
>>   			bind: {
>>   			    allowBlank: '{configuration}'
>> +			},
>> +			cbind: {
>> +			    nodename: '{nodename}'
>>   			}
>>   		    },
>>   		    {
>> @@ -197,7 +200,10 @@ Ext.define('PVE.ceph.CephInstallWizard', {
>>   			fieldLabel: 'Cluster Network IP/CIDR',
>>   			allowBlank: true,
>>   			autoSelect: false,
>> -			emptyText: gettext('Same as Public Network')
>> +			emptyText: gettext('Same as Public Network'),
>> +			cbind: {
>> +			    nodename: '{nodename}'
>> +			}
>>   		    }
>>   		    // FIXME: add hint about cluster network and/or reference user to docs??
>>   		],
>>
> applied, next time I'd like to have trailing commas added at the
> end for such changes, to avoid touching unrelated lines in a next
> patch.
Sorry about that, somehow remembered that it was not ok in JS. PVE5 and 
jslint related perhaps? Will remember it next time.




More information about the pve-devel mailing list