foreman_fog_proxmox 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f41380ca48818adb7aeff9b8d59eccf6bc371687abbc93983bba2d4c261cbfe
-  data.tar.gz: 8ed09647f083281199e8245e1660e11f92642e0ae91432e3a2cd1d37d32a9e8f
+  metadata.gz: 75626a2ceb3ba5b72a8938a76f9bd50ad1d337565d5eb8c9253bb76bf90b7f8f
+  data.tar.gz: d06eeccaa0e89c3e34d73d9558a80f65fadcc3f6188c7db71228debbaf223984
 SHA512:
-  metadata.gz: 7197010a2fc99a9ce5e8fae7688220e21cba65dd144b2335bb19867ba4eb9da2bec2312bc6d58c637cf696c04b0c2ba35b3badbd5a137ecb49dc77787cfad303
-  data.tar.gz: e75a5f8eab3219fb8d3de3a4ad5040a0f404ed39ffe3956a481d9525ca81d3bb1ee173ac2a2de630a3006ad4e6319c76d19b0df1aeea57d03a12e3ca8443695b
+  metadata.gz: a93fee7915341da532c5572b40bb6f5eec03e6a3f2e9b7d6ae66ae50b89b7ae65f8806ee036a351885cd2175ba276f563e7905a5cf029200500a0b1bf97258a4
+  data.tar.gz: 96ccb17ba381f892e8c0633c9e55a773ccc7c0857be36aac42e2ce4ea0a1ba5b19c383a0a3b8e32d358ac38af3c0647e16486774dd774dd666ee9e3d9ea871ff

data/README.md

@@ -86,7 +86,7 @@ Then you can check plugin installation after login into your new foreman server
 
 ### From OS packages
 
-Deb, rpm: work in progress...
+[Deb](https://github.com/theforeman/foreman-packaging/pull/3071), [rpm](https://github.com/theforeman/foreman-packaging/pull/3069): work in progress...
 
 Please see the Foreman manual for complete instructions:
 

data/app/overrides/compute_resources_vms/form/add_clone_to_new_vm_compute_detail.rb

@@ -21,4 +21,13 @@ Deface::Override.new(
     :replace => "erb[silent]:contains('new_vm = @host.nil? || new_vm?(@host)')",
     :text => "<% new_vm = @host.nil? || new_vm?(@host) || @host.name.nil? %>",
     :original => "<% new_vm = @host.nil? || new_vm?(@host) %>"
+)
+
+
+Deface::Override.new(
+    :virtual_path => "hosts/_compute_detail",
+    :name => "add_from_profile_to_compute_detail",
+    :replace => "erb[loud]:contains('provider_partial')",
+    :partial => "compute_resources_vms/form/proxmox/add_from_profile_to_hosts_compute_detail_form",
+    :original => '448e3b265e4dc1789f0efbbc6076e32216ac3a24'
 )

data/app/overrides/compute_resources_vms/form/add_from_profile_to_compute_attributes_form.rb

@@ -0,0 +1,32 @@
+# Copyright 2018 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/>.
+
+Deface::Override.new(
+    :virtual_path => "compute_attributes/_form",
+    :name => "add_from_profile_to_compute_attributes_form",
+    :replace => "erb[loud]:contains('render')",
+    :partial => "compute_resources_vms/form/proxmox/add_from_profile_to_compute_attributes_form",
+    :original => '0e01b2f93b6855afc207e0e301515cdd300a1c61'
+)
+
+Deface::Override.new(
+    :virtual_path => "compute_attributes/_compute_form",
+    :name => "add_from_profile_to_compute_form",
+    :replace => "erb[loud]:contains('provider_partial')",
+    :partial => "compute_resources_vms/form/proxmox/add_from_profile_to_compute_form",
+    :original => '107f930f8e6b2bdd3e728757d8320d483f19ff9e'
+)

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

@@ -0,0 +1,18 @@
+<%# Copyright 2018 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/>. %>
+<%= render :partial => "compute_form",
+    :locals => { :f => f2, :compute_resource => @set.compute_resource, :selected_cluster => @set.vm_attrs['cluster'], :from_profile => true } %>

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

@@ -0,0 +1,18 @@
+<%# Copyright 2018 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/>. %>
+<%= render :partial => provider_partial(compute_resource, 'base'),
+        :locals => { :f => f, :compute_resource => compute_resource, :new_host => true, :new_vm => true, :hide_image => true, :from_profile => from_profile }.merge(args_for_compute_resource_partial(@host)) %>

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

@@ -0,0 +1,18 @@
+<%# Copyright 2018 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/>. %>
+<%= render :partial => provider_partial(compute_resource, 'base'),
+            :locals => { :f => f, :compute_resource => compute_resource, :new_host => new_vm, :new_vm => new_vm, :from_profile => false }.merge(args_for_compute_resource_partial(@host)) %>

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

@@ -21,7 +21,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= select_f f, :type, proxmox_types_map, :id, :name, { }, :label => _('Type'), :label_size => "col-md-2", :onchange => "vmTypeSelected()", :disabled => !new_vm %>
 
 <!-- VM General Settings -->
-<%= render :partial => "compute_resources_vms/form/proxmox/general", :locals => { :f => f, :compute_resource =>  compute_resource, :new_vm => new_vm } %>
+<%= render :partial => "compute_resources_vms/form/proxmox/general", :locals => { :f => f, :compute_resource =>  compute_resource, :new_vm => new_vm, :from_profile => from_profile } %>
 
 <!-- VM Extended Settings -->
 <%= render :partial => "compute_resources_vms/form/proxmox/container/extended", :locals => { :f => f, :compute_resource =>  compute_resource, :new_vm => new_vm } %>

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

@@ -19,7 +19,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
 <%= field_set_tag _("General"), :id => "general" do %>
   <%= checkbox_f f, :templated, :label => _('Create image?'), :disabled => untemplatable, :class => ('hide' if untemplatable), :no_label => untemplatable %>
-  <%= counter_f f, :vmid, :label => _('VM ID'), :label_size => "col-md-2", :required => true, :disabled => !new_vm %>
+  <%= counter_f f, :vmid, :label => _('VM ID'), :label_size => "col-md-2", :required => true, :disabled => (!new_vm || from_profile) %>
   <%= select_f f, :node, compute_resource.nodes, :node, :node, { }, :label => _('Node'), :label_size => "col-md-2", :required => true, :disabled => true %>
   <% unless local_assigns[:hide_image] && !new_vm %>
     <%

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.5.2'.freeze
+  VERSION = '0.5.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Tristan Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-proxmox
@@ -112,6 +112,7 @@ files:
 - app/models/foreman_fog_proxmox/options_select.rb
 - app/models/foreman_fog_proxmox/proxmox.rb
 - app/overrides/compute_resources_vms/form/add_clone_to_new_vm_compute_detail.rb
+- app/overrides/compute_resources_vms/form/add_from_profile_to_compute_attributes_form.rb
 - app/overrides/compute_resources_vms/form/add_vm_type_to_networks_form.rb
 - app/overrides/compute_resources_vms/form/add_vm_type_to_nic_provider_specific_form.rb
 - app/overrides/compute_resources_vms/form/add_vm_type_to_volumes_edit.rb
@@ -120,6 +121,9 @@ files:
 - app/views/api/v2/compute_resources/proxmox.json.rabl
 - app/views/compute_resources/form/_proxmox.html.erb
 - app/views/compute_resources/show/_proxmox.html.erb
+- app/views/compute_resources_vms/form/proxmox/_add_from_profile_to_compute_attributes_form.html.erb
+- app/views/compute_resources_vms/form/proxmox/_add_from_profile_to_compute_form.html.erb
+- app/views/compute_resources_vms/form/proxmox/_add_from_profile_to_hosts_compute_detail_form.html.erb
 - app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_networks_form.html.erb
 - app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_networks_new_childs_form.html.erb
 - app/views/compute_resources_vms/form/proxmox/_add_vm_type_to_nic_provider_specific_form.html.erb