Project

General

Profile

« Previous | Next » 

Revision 04ae1269

Added by Shira Maximov almost 6 years ago

Fixes #22117 - Add support for number of sockets for ovirt

View differences:

app/models/compute_resources/foreman/model/ovirt.rb
super.merge({:mac => :mac})
end
# FIXME
def max_cpu_count
8
16
end
def max_socket_count
16
end
def max_memory
app/views/compute_resources_vms/form/ovirt/_base.html.erb
<% selected_cluster ||= params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:cluster] %>
<%= counter_f f, :cores, :disabled => !new_vm, :label => _('Cores'), :label_size => 'col-md-2', :'data-soft-max' => compute_resource.max_cpu_count %>
<%= counter_f f, :sockets, :disabled => !new_vm, :label => _('Sockets'), :label_size => 'col-md-2', :'data-soft-max' => compute_resource.max_socket_count %>
<%= byte_size_f f, :memory, :disabled => !new_vm, :label => _('Memory'), :label_size => "col-md-2", :'data-soft-max' => compute_resource.max_memory %>
<% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1' %>
bundler.d/ovirt.rb
group :ovirt do
gem 'fog-ovirt', '~> 1.0.3'
gem 'fog-ovirt', '~> 1.0.4'
end
webpack/assets/javascripts/compute_resource/ovirt.js
if (!$('#host_compute_attributes_instance_type').val()) {
$('[id$=_memory]').val(result.memory).trigger('change');
$('[id$=_cores]').val(result.cores);
$('[id$=_sockets]').val(result.sockets);
}
$('#network_interfaces').children('.fields').remove();
$.each(result.interfaces, function () {
......
success(result) {
$('[id$=_memory]').val(result.memory).trigger('change');
$('[id$=_cores]').val(result.cores);
$('[id$=_sockets]').val(result.sockets);
const instanceTypeSelector = $('#host_compute_attributes_instance_type');
if (instanceTypeSelector.is(':disabled')) {

Also available in: Unified diff