foreman_fog_proxmox 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a2aa0eb531e4580fc08dd5645fb2db4a4f1f2cbe22e9f8facee9428e1ca2d75
-  data.tar.gz: fcc524d8576edc27619cae0f08049e429bca3a936d5970e094dbd55ea28df8d7
+  metadata.gz: 9c5ef621a01ef69d1d270c6feb71f77046a254a556ff257c81633f372debeaad
+  data.tar.gz: 6d2b6dfcb99730a206f14798f4f7c79e0573eddad591227644d6b37f5e80a40f
 SHA512:
-  metadata.gz: b2faa03134097bbcf3923d768469b73b37c3fb0230cf75090306ed2dd40529282fab6518cc9558693b513310ea875d947ab1f8403cb9045b09a94b03b1f4a072
-  data.tar.gz: d9480dfad771621a8debce4575689a60ddb3328da49e3133e73005e28522514c538aecc592b1aa97b5b2a1734fe62f954ebedd8306fca4fda0af46448e07ab48
+  metadata.gz: fd050c257f61d7cc967434ae57b7448b63451f6b13919036b2bea7eb43de7acad752c941114b7f7e1798e3274fc1afe7c89f8626444e1c280cfe6d658206ad0e
+  data.tar.gz: 279158c35f1276fcc29f8a29fa16fe3ab3546943f58de2647dd5938f7ac32cc012f16b14cb5819c9c4706ca1df666c8bfb9f77cb8a056f9f17d6803cf10b0fcf

data/README.md

@@ -1,8 +1,9 @@
 ![ForemanFogProxmox](.github/images/foremanproxmox.png)
 
-[![Build Status](https://travis-ci.com/theforeman/foreman_fog_proxmox.svg?branch=master)](https://travis-ci.com/theforeman/foreman_fog_proxmox)
+![CI](https://github.com/theforeman/foreman_fog_proxmox/workflows/CI/badge.svg)
 [![Maintainability](https://api.codeclimate.com/v1/badges/922162c278e0fa9207ba/maintainability)](https://codeclimate.com/github/theforeman/foreman_fog_proxmox/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/922162c278e0fa9207ba/test_coverage)](https://codeclimate.com/github/theforeman/foreman_fog_proxmox/test_coverage)
+[![Gem Version](https://badge.fury.io/rb/foreman_fog_proxmox.svg)](https://badge.fury.io/rb/foreman_fog_proxmox)
 
 # ForemanFogProxmox
 
@@ -30,6 +31,7 @@ You can support the plugin development via the following methods:
 |>=0.9 |>=5.4|>=0.9.1|>=1.22|>=2.3|
 |>=0.10 |>=5.4|>=0.9.4|>=1.22|>=2.5|
 |>=0.11 |>=5.4|>=0.10|>=1.22|>=2.5|
+|>=0.12 |>=6.1|>=0.11|>=2.0|>=2.5|
 
 ## Installation
 
@@ -129,8 +131,8 @@ git clone https://github.com/theforeman/foreman -b develop
 * Add this line:
 
 ```ruby
-gem 'foreman_fog_proxmox', :path => '/your_path_to/foreman_fog_proxmox'
-gem 'fog-proxmox', :path => '/your_path_to/fog-proxmox' # optional if you need to modify fog-proxmox code too
+gem 'foreman_fog_proxmox', :path => '../../theforeman/foreman_fog_proxmox'
+gem 'fog-proxmox', :path => '../../fog/fog-proxmox' # optional if you need to modify fog-proxmox code too
 gem 'ruby-debug-ide' # dev
 gem 'debase' # dev
 gem 'simplecov' # test
@@ -139,7 +141,8 @@ gem 'simplecov' # test
 * In foreman directory, install dependencies:
 
 ```shell
-bundle install --without libvirt postgresql mysql2
+bundle config set without 'libvirt ovirt mysql2'
+bundle install
 ```
 
 ```shell
@@ -152,14 +155,25 @@ npm install
 cp config/settings.yaml.test config/settings.yaml
 ```
 
-* Install foreman database (sqlite is default in rails development):
+* Install foreman database in postgresql (sqlite is no more default in rails development):
 
 ```shell
 cp config/model.mappings.example config/model.mappings
 cp config/database.yml.example config/database.yml
+```
+
+add these lines to config/database.yml:
+
+```yaml
+    username: foreman
+    password: foreman
+```
+
+```shell
 cp config/ignored_environments.yml.sample config/ignored_environments.yml
+docker run --name foreman-db -e POSTGRES_DB=foreman -e POSTGRES_USER=foreman -e POSTGRES_PASSWORD=foreman -p 5432:5432 -d postgres
 bundle exec bin/rake db:migrate
-bundle exec bin/rake db:seed
+bundle exec bin/rake db:seed assets:precompile locale:pack webpack:compile
 ```
 
 * You can reset admin password if needed:
@@ -170,6 +184,13 @@ bundle exec bin/rake permissions:reset
 
 * You should write tests and you can execute those specific to this plugin:
 
+first, create database `foreman-test` with psql commands:
+
+```shell
+docker exec -it foreman-db psql -U foreman
+foreman=# create database "foreman-test";
+```
+
 all:
 
 ```shell
@@ -208,16 +229,28 @@ bundle exec bin/rake plugin:assets:precompile[foreman_fog_proxmox]
 bundle exec bin/rake plugin:gettext[foreman_fog_proxmox]
 ```
 
-* In foreman directory, run rails server:
+* In foreman directory, run in a new terminal the webpack-dev-server:
 
 ```shell
-bundle exec bin/rails server
+./node_modules/.bin/webpack-dev-server --config config/webpack.config.js
 ```
 
-* In foreman directory, run in a new terminal the webpack-dev-server:
+* Or without webpack-dev-server, add this line in config/settings.yml:
+
+```yml
+:webpack_dev_server: false
+```
+
+then compile webpack assets:
 
 ```shell
-./node_modules/.bin/webpack-dev-server --config config/webpack.config.js
+bundle exec bin/rake webpack:compile
+```
+
+* In foreman directory, run rails server:
+
+```shell
+bundle exec bin/rails server
 ```
 
 * Or you can launch all together:
@@ -232,8 +265,9 @@ See details in [foreman plugin development](https://projects.theforeman.org/proj
 
 If you like it and still want to improve it, [sponsor me](https://github.com/sponsors/tristanrobert)!
 
-You can reach the [contributors](.github/CONTRIBUTORS.md).
-Bug reports and pull requests are welcome on GitHub at [ForemanFogProxmox](https://github.com/theforeman/foreman_fog_proxmox).
+* You can reach the [contributors](.github/CONTRIBUTORS.md).
+* [Translate it in your favorite language](https://www.transifex.com/foreman/foreman/foreman_fog_proxmox/)
+* Bug reports and pull requests are welcome on GitHub at [ForemanFogProxmox](https://github.com/theforeman/foreman_fog_proxmox).
 
 Please read more information about [how to contribute](.github/CONTRIBUTING.md).
 

data/app/assets/javascripts/foreman_fog_proxmox/proxmox_vm_server.js

@@ -122,26 +122,4 @@ function computeControllerMaxDevice(controller) {
     default:
       return 1;
   }
-}
-
-function balloonSelected(item) {
-  var ballooned = $(item).is(':checked');
-  var memory_f = $("input[name$='[config_attributes][memory]']:hidden");
-  var min_memory_f = $("input[id$='config_attributes_min_memory']");
-  var min_memory_hidden_f = $("input[name$='[config_attributes][min_memory]']:hidden");
-  var shares_f = $("input[id$='config_attributes_shares']");
-  var shares_hidden_f = $("input[name$='[config_attributes][shares]']:hidden");
-  if (ballooned) {
-    min_memory_f.removeAttr('disabled');
-    shares_f.removeAttr('disabled');
-    var max = memory_f.val();
-    console.log("max=" + max);
-    min_memory_f.attr('data-soft-max', max);
-  } else {
-    min_memory_f.attr('disabled', 'disabled');
-    min_memory_hidden_f.attr('value', '');
-    shares_f.attr('disabled', 'disabled');
-    shares_hidden_f.attr('value', '');
-  }
-  tfm.numFields.initAll();
 }

data/app/helpers/proxmox_compute_selectors_helper.rb

@@ -47,6 +47,15 @@ module ProxmoxComputeSelectorsHelper
      ForemanFogProxmox::OptionsSelect.new(name: 'VirtIO Block', id: 'virtio', range: 15)]
   end
 
+  def proxmox_scsi_controllers_map
+    [OpenStruct.new(id: 'lsi', name: 'LSI 53C895A (Default)'),
+     OpenStruct.new(id: 'lsi53c810', name: 'LSI 53C810'),
+     OpenStruct.new(id: 'virtio-scsi-pci', name: 'VirtIO SCSI'),
+     OpenStruct.new(id: 'virtio-scsi-single', name: 'VirtIO SCSI Single'),
+     OpenStruct.new(id: 'megasas', name: 'MegaRAID SAS 8708EM2'),
+     OpenStruct.new(id: 'pvscsi', name: 'VMware PVSCSI')]
+  end
+
   def proxmox_operating_systems_map
     [OpenStruct.new(id: 'other', name: 'Unspecified OS'),
      OpenStruct.new(id: 'wxp', name: 'Microsoft Windows XP'),

data/app/helpers/proxmox_server_helper.rb

@@ -38,7 +38,7 @@ module ProxmoxServerHelper
     volumes = parse_server_volumes(vols)
     cpu_a = ['cpu_type', 'spectre', 'pcid']
     cpu = parse_server_cpu(config.select { |key, _value| cpu_a.include? key })
-    memory_a = ['memory', 'min_memory', 'balloon', 'shares']
+    memory_a = ['memory', 'balloon', 'shares']
     memory = parse_server_memory(config.select { |key, _value| memory_a.include? key })
     interfaces_attributes = args['interfaces_attributes']
     interfaces_to_add, interfaces_to_delete = parse_server_interfaces(interfaces_attributes)
@@ -64,11 +64,7 @@ module ProxmoxServerHelper
   def parse_server_memory(args)
     memory = {}
     memory.store(:memory, args['memory'].to_i) if args['memory']
-    ballooned = args['balloon'].to_i == 1
-    if ballooned
-      memory.store(:shares, args['shares'].to_i) if args['shares']
-      memory.store(:min_memory, args['min_memory'].to_i) if args['min_memory']
-    end
+    memory.store(:shares, args['shares'].to_i) if args['shares']
     memory.store(:balloon, args['balloon'].to_i) if args['balloon']
     logger.debug("parse_server_memory(): #{memory}")
     memory

data/app/helpers/proxmox_vm_helper.rb

@@ -59,7 +59,7 @@ module ProxmoxVmHelper
 
   def convert_memory_sizes(args)
     convert_memory_size(args['config_attributes'], 'memory')
-    convert_memory_size(args['config_attributes'], 'min_memory')
+    convert_memory_size(args['config_attributes'], 'balloon')
     convert_memory_size(args['config_attributes'], 'shares')
     convert_memory_size(args['config_attributes'], 'swap')
   end
@@ -70,7 +70,7 @@ module ProxmoxVmHelper
 
   def convert_sizes(args)
     convert_memory_size(args['config_attributes'], 'memory')
-    convert_memory_size(args['config_attributes'], 'min_memory')
+    convert_memory_size(args['config_attributes'], 'balloon')
     convert_memory_size(args['config_attributes'], 'shares')
     convert_memory_size(args['config_attributes'], 'swap')
     args['volumes_attributes'].each_value { |value| value['size'] = (value['size'].to_i / GIGA).to_s unless ForemanFogProxmox::Value.empty?(value['size']) }

data/app/models/concerns/fog_extensions/proxmox/server.rb

@@ -77,6 +77,7 @@ module FogExtensions
       end
 
       delegate :vga, to: :config
+      delegate :pool, to: :config
 
       def interfaces_attributes=(attrs); end
 

data/app/models/foreman_fog_proxmox/proxmox_pools.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+# Copyright 2019 Tristan Robert
+
+# This file is part of ForemanFogProxmox.
+
+# ForemanFogProxmox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# ForemanFogProxmox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
+
+module ForemanFogProxmox
+  module ProxmoxPools
+    def pools
+      pools = identity_client.pools.all
+      pools.sort_by(&:poolid)
+    end
+
+    def pool_owner(vm)
+      logger.debug(format(_('pool_owner(%<vmid>s)'), vmid: vm&.vmid))
+      pools_owners = pools.select { |pool| pool.has_server?(vm&.vmid) }
+      pool = pools_owners.first
+      logger.debug(format(_('found vm: %<vmid>s member of pool: %<poolid>s'), vmid: vm&.vmid, poolid: pool&.poolid))
+      vm&.config&.pool = pool&.poolid
+    end
+
+    def add_vm_to_pool(poolid, vmid)
+      logger.debug(format(_('add_vm_to_pool(%<poolid>s, %<vmid>s)'), poolid: poolid, vmid: vmid))
+      pool = identity_client.pools.get poolid
+      pool&.add_server vmid
+    end
+
+    def remove_vm_from_pool(poolid, vmid)
+      logger.debug(format(_('remove_vm_from_pool(%<poolid>s, %<vmid>s)'), poolid: poolid, vmid: vmid))
+      pool = identity_client.pools.get poolid
+      pool&.remove_server vmid
+    end
+
+    def update_pool(vm, poolid)
+      pool_owner(vm)
+      vm_pool = vm.config.pool || ''
+      return if vm_pool.eql?(poolid)
+
+      remove_vm_from_pool(vm_pool, vm.vmid)
+      add_vm_to_pool(poolid, vm.vmid)
+    end
+  end
+end

data/app/models/foreman_fog_proxmox/proxmox_vm_commands.rb

@@ -20,6 +20,7 @@
 module ForemanFogProxmox
   module ProxmoxVmCommands
     include ProxmoxVolumes
+    include ProxmoxPools
 
     def start_on_boot(vm, args)
       startonboot = args[:start_after_create].blank? ? false : Foreman::Cast.to_bool(args[:start_after_create])
@@ -100,11 +101,13 @@ module ForemanFogProxmox
         volumes_attributes&.each_value { |volume_attributes| save_volume(vm, volume_attributes) }
         parsed_attr = vm.container? ? parse_container_vm(new_attributes.merge(type: vm.type)) : parse_server_vm(new_attributes.merge(type: vm.type))
         logger.debug("parsed_attr=#{parsed_attr}")
-        config_attributes = parsed_attr.reject { |key, _value| [:vmid, :templated, :ostemplate, :ostemplate_file, :ostemplate_storage, :volumes_attributes].include? key.to_sym }
+        config_attributes = parsed_attr.reject { |key, _value| [:vmid, :templated, :ostemplate, :ostemplate_file, :ostemplate_storage, :volumes_attributes, :pool].include? key.to_sym }
         config_attributes = config_attributes.reject { |_key, value| ForemanFogProxmox::Value.empty?(value) }
         cdrom_attributes = parsed_attr.select { |_key, value| Fog::Proxmox::DiskHelper.cdrom?(value.to_s) }
         config_attributes = config_attributes.reject { |key, _value| Fog::Proxmox::DiskHelper.disk?(key) }
         vm.update(config_attributes.merge(cdrom_attributes))
+        poolid = new_attributes['pool'] if new_attributes.key?('pool')
+        update_pool(vm, poolid) if poolid
       end
       find_vm_by_uuid(uuid)
     end

data/app/models/foreman_fog_proxmox/proxmox_vm_new.rb

@@ -39,9 +39,9 @@ module ForemanFogProxmox
       type ||= 'qemu'
       case type
       when 'lxc'
-        return new_volume_server(attr)
+        new_volume_server(attr)
       when 'qemu'
-        return new_volume_container(attr)
+        new_volume_container(attr)
       end
     end
 
@@ -74,9 +74,9 @@ module ForemanFogProxmox
       type ||= 'qemu'
       case type
       when 'lxc'
-        return new_container_interface(attr)
+        new_container_interface(attr)
       when 'qemu'
-        return new_server_interface(attr)
+        new_server_interface(attr)
       end
     end
 

data/app/models/foreman_fog_proxmox/proxmox_vm_queries.rb

@@ -19,16 +19,13 @@
 
 module ForemanFogProxmox
   module ProxmoxVmQueries
+    include ProxmoxPools
+
     def nodes
       nodes = client.nodes.all if client
       nodes&.sort_by(&:node)
     end
 
-    def pools
-      pools = identity_client.pools.all
-      pools.sort_by(&:poolid)
-    end
-
     def storages(node_id = default_node_id, type = 'images')
       node = client.nodes.get node_id
       node ||= default_node
@@ -65,12 +62,14 @@ module ForemanFogProxmox
     end
 
     def find_vm_in_servers_by_uuid(servers, uuid)
-      servers.get(uuid) if !uuid.nil? && !uuid.to_s.empty?
+      vm = servers.get(uuid) if !uuid.nil? && !uuid.to_s.empty?
+      pool_owner(vm) if vm
+      vm
     rescue Fog::Errors::NotFound
       nil
     rescue StandardError => e
       Foreman::Logging.exception(format(_('Failed retrieving proxmox server vm by vmid=%<vmid>s'), vmid: uuid), e)
-      raise(ActiveRecord::RecordNotFound)
+      raise(ActiveRecord::RecordNotFound, e)
     end
   end
 end

data/app/views/api/v2/compute_resources/proxmox.json.rabl

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-attributes :user, :url, :ssl_verify_peer, :disable_proxy
+attributes :url, :user, :password, :ssl_verify_peer, :ssl_certs, :renew

data/app/views/compute_resources_vms/form/proxmox/_general.html.erb

@@ -35,4 +35,5 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
       :label_size => "col-md-2" %>
     </div>
   <% end %>
+  <%= select_f f, :pool, compute_resource.pools, :poolid, :poolid, { :include_blank => true }, :label => _('Pool'), :label_size => "col-md-2", :required => false %>
 <% end %>

data/app/views/compute_resources_vms/form/proxmox/server/_config.html.erb

@@ -27,6 +27,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= checkbox_f f, :kvm, :label => _('KVM'), :label_help => _('Enable/disable KVM hardware virtualization') %>
   <%= select_f f, :keyboard, proxmox_keyboards_map, :id,  :name, { }, :label => _('Keyboard'), :label_size => "col-md-2" %>
   <%= select_f f, :vga, proxmox_vgas_map, :id, :name, { :include_blank => true }, :label => _('VGA'), :label_size => "col-md-2" %>
+  <%= select_f f, :scsihw, proxmox_scsi_controllers_map, :id, :name, { }, :label => _('SCSI Controller'), :label_size => "col-md-2" %>
 <% end %>
 <%= field_set_tag _("CPU"), :id => "server_config_cpu", :class => 'hide', :disabled => !server do %>
   <%= select_f f, :cpu_type, proxmox_cpus_map, :id, :name, { }, :label => _('Type'), :label_size => "col-md-2" %>
@@ -40,11 +41,9 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
   <%= checkbox_f f, :spectre, :label => _('Spectre-CTRL') %>
 <% end %>
 <%= field_set_tag _("Memory"), :id => "server_config_memory", :class => 'hide', :disabled => !server do %>
-  <% ballooned = f.object.balloon == 1 %>
   <%= byte_size_f f, :memory, :class => "input-mini", :label => _('Memory'), :label_size => "col-md-2" %>
-  <%= byte_size_f f, :min_memory, :class => "input-mini", :label => _('Minimum memory'), :label_size => "col-md-2", :disabled => !ballooned %>
-  <%= counter_f f, :shares, :class => "input-mini", :label => _('Shares'), :label_size => "col-md-2", :disabled => !ballooned %>
-  <%= checkbox_f f, :balloon, :label => _('Ballooning Device'), :onchange => 'balloonSelected(this)' %>
+  <%= byte_size_f f, :balloon, :class => "input-mini", :label => _('Minimum memory'), :label_size => "col-md-2" %>
+  <%= counter_f f, :shares, :class => "input-mini", :label => _('Shares'), :label_size => "col-md-2" %>
 <% end %>
 <%= field_set_tag _("CD-ROM"), :id => "server_config_cdrom", :class => 'hide', :disabled => !server do %>
   <%= radio_button_f f, :cdrom, :value => 'none', :text => _('None'), :onclick => 'cdromSelected(this)' %>

data/app/views/compute_resources_vms/show/_proxmox.html.erb

@@ -26,6 +26,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
       <%= prop :type %>
       <%= prop :node_id %>
       <%= prop :templated? %>
+      <%= prop :pool %>
       <%= prop :memory %>
       <% unless @vm.container? %>
         <%= prop :vga %>

data/lib/foreman_fog_proxmox/version.rb

@@ -18,5 +18,5 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ForemanFogProxmox
-  VERSION = '0.10.2'
+  VERSION = '0.11.0'
 end

data/locale/en/foreman_fog_proxmox.edit.po

@@ -65,6 +65,22 @@ msgstr ""
 msgid "create_vm(): clone %<image_id>s in %<vmid>s"
 msgstr ""
 
+#: ../app/models/foreman_fog_proxmox/proxmox_pools.rb:28
+msgid "pool_owner(%<vmid>s)"
+msgstr ""
+
+#: ../app/models/foreman_fog_proxmox/proxmox_pools.rb:31
+msgid "found vm: %<vmid>s member of pool: %<poolid>s"
+msgstr ""
+
+#: ../app/models/foreman_fog_proxmox/proxmox_pools.rb:36
+msgid "add_vm_to_pool(%<poolid>s, %<vmid>s)"
+msgstr ""
+
+#: ../app/models/foreman_fog_proxmox/proxmox_pools.rb:42
+msgid "remove_vm_from_pool(%<poolid>s, %<vmid>s)"
+msgstr ""
+
 #: ../app/models/foreman_fog_proxmox/proxmox_version.rb:25
 msgid "Proxmox compute resource version is %<version>s"
 msgstr ""
@@ -73,11 +89,11 @@ msgstr ""
 msgid "Proxmox version %<version>s is not semver suitable"
 msgstr ""
 
-#: ../app/models/foreman_fog_proxmox/proxmox_vm_commands.rb:34
+#: ../app/models/foreman_fog_proxmox/proxmox_vm_commands.rb:35
 msgid "invalid vmid=%<vmid>s"
 msgstr ""
 
-#: ../app/models/foreman_fog_proxmox/proxmox_vm_commands.rb:53
+#: ../app/models/foreman_fog_proxmox/proxmox_vm_commands.rb:54
 msgid "failed to create vm: %<e>s"
 msgstr ""
 
@@ -93,7 +109,7 @@ msgstr ""
 msgid "new_server_vm() vm.config=%<config>s"
 msgstr ""
 
-#: ../app/models/foreman_fog_proxmox/proxmox_vm_queries.rb:72
+#: ../app/models/foreman_fog_proxmox/proxmox_vm_queries.rb:71
 msgid "Failed retrieving proxmox server vm by vmid=%<vmid>s"
 msgstr ""
 
@@ -165,7 +181,7 @@ msgstr ""
 msgid "add new storage volume"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/_base.html.erb:6 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:17 ../app/views/compute_resources_vms/index/_proxmox.html.erb:8
+#: ../app/views/compute_resources_vms/form/proxmox/_base.html.erb:6 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:18 ../app/views/compute_resources_vms/index/_proxmox.html.erb:8
 msgid "Type"
 msgstr ""
 
@@ -189,10 +205,14 @@ msgstr ""
 msgid "Start after creation?"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:19 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:37
+#: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:19 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:36
 msgid "Image"
 msgstr ""
 
+#: ../app/views/compute_resources_vms/form/proxmox/_general.html.erb:23
+msgid "Pool"
+msgstr ""
+
 #: ../app/views/compute_resources_vms/form/proxmox/container/_advanced.html.erb:5 ../app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb:5
 msgid "Advanced"
 msgstr ""
@@ -203,11 +223,11 @@ msgid_plural "Main options"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/container/_advanced.html.erb:8 ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:9 ../app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb:8 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:16
+#: ../app/views/compute_resources_vms/form/proxmox/container/_advanced.html.erb:8 ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:9 ../app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb:8 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:17
 msgid "CPU"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/container/_advanced.html.erb:10 ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:15 ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:16 ../app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb:10 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:27 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:29 ../app/views/compute_resources_vms/index/_proxmox.html.erb:10
+#: ../app/views/compute_resources_vms/form/proxmox/container/_advanced.html.erb:10 ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:15 ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:16 ../app/views/compute_resources_vms/form/proxmox/server/_advanced.html.erb:10 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:28 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:29 ../app/views/compute_resources_vms/index/_proxmox.html.erb:10
 msgid "Memory"
 msgstr ""
 
@@ -231,15 +251,15 @@ msgstr ""
 msgid "Architecture"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:11 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:19
+#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:11 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:20
 msgid "Cores"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:12 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:21
+#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:12 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:22
 msgid "CPU limit"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:13 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:22
+#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:13 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:23
 msgid "CPU units"
 msgstr ""
 
@@ -259,11 +279,11 @@ msgstr ""
 msgid "Search domain"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:24 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:43
+#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:24 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:42
 msgid "Operating System"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:25 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:44
+#: ../app/views/compute_resources_vms/form/proxmox/container/_config.html.erb:25 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:43
 msgid "OS type"
 msgstr ""
 
@@ -331,7 +351,7 @@ msgstr ""
 msgid "Mount point"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/container/_volume_mp.html.erb:8 ../app/views/compute_resources_vms/form/proxmox/container/_volume_rootfs.html.erb:7 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:39 ../app/views/compute_resources_vms/form/proxmox/server/_volume.html.erb:8
+#: ../app/views/compute_resources_vms/form/proxmox/container/_volume_mp.html.erb:8 ../app/views/compute_resources_vms/form/proxmox/container/_volume_rootfs.html.erb:7 ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:38 ../app/views/compute_resources_vms/form/proxmox/server/_volume.html.erb:8
 msgid "Storage"
 msgstr ""
 
@@ -387,23 +407,27 @@ msgstr ""
 msgid "VGA"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:18
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:15
+msgid "SCSI Controller"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:19
 msgid "Sockets"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:20
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:21
 msgid "VCPUs"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:23
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:24
 msgid "Enable NUMA"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:24
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:25
 msgid "PCID"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:25
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:26
 msgid "Spectre-CTRL"
 msgstr ""
 
@@ -415,23 +439,19 @@ msgstr ""
 msgid "Shares"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:32
-msgid "Ballooning Device"
-msgstr ""
-
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:34
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:33
 msgid "CD-ROM"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:35
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:34
 msgid "None"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:36
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:35
 msgid "Physical"
 msgstr ""
 
-#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:40
+#: ../app/views/compute_resources_vms/form/proxmox/server/_config.html.erb:39
 msgid "Image ISO"
 msgstr ""