Add possibillity to distinguish container and vm on RBD Storage.

this is necessary because we use image files for both.

diff --git a/www/manager/lxc/CreateWizard.js b/www/manager/lxc/CreateWizard.js
index 77df9913642a1b166791e98f708003e0bc46c5cd..d0373167a03d2d20d9459c2fc18e6f12c6ddbcbd 100644 (file)
--- a/www/manager/lxc/CreateWizard.js
+++ b/www/manager/lxc/CreateWizard.js
@@ -18,7 +18,7 @@ Ext.define('PVE.lxc.CreateWizard', {
        var storagesel = Ext.create('PVE.form.StorageSelector', {
            name: 'storage',
            fieldLabel: gettext('Storage'),
-           storageContent: 'images,rootdir',
+           storageContent: 'rootdir',
            autoSelect: true,
            allowBlank: false
        });

diff --git a/www/manager/storage/RBDEdit.js b/www/manager/storage/RBDEdit.js
index 0170ba44d25ceffd39bd6f70f58e316fa89bd950..8f1abf250a5a92905d5d62119ab6bbbd3ab6b910 100644 (file)
--- a/www/manager/storage/RBDEdit.js
+++ b/www/manager/storage/RBDEdit.js
@@ -65,6 +65,15 @@ Ext.define('PVE.storage.RBDInputPanel', {
                checked: true,
                uncheckedValue: 0,
                fieldLabel: gettext('Enable')
+           },
+           {
+               xtype: 'pveContentTypeSelector',
+               cts: ['images', 'rootdir'],
+               fieldLabel: gettext('Content'),
+               name: 'content',
+               value: ['images', 'rootdir'],
+               multiSelect: true,
+               allowBlank: false
            }
        ];
 
@@ -117,6 +126,11 @@ Ext.define('PVE.storage.RBDEdit', {
             me.load({
                 success:  function(response, options) {
                     var values = response.result.data;
+
+                   var ctypes = values.content || '';
+
+                   values.content = ctypes.split(',');
+
                     if (values.nodes) {
                         values.nodes = values.nodes.split(',');
                     }