foreman_azure_rm 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e05c23b1a095391bdea55a57e7dfca7f8563e0d73acd4b02b3d56e6591be5f42
-  data.tar.gz: 3f16062a92f583807ec4884be2e939f725c6aa9ca488db945dd1f78bb6b929c2
+  metadata.gz: 9db2c6a180afc8c47af707c9857d8c45c4505b6326b07fc35b7dacd4effb4158
+  data.tar.gz: 54e4039412ad74a2f8b7113b827a5b86c8ecc2940da9b891d2578ee92e63614b
 SHA512:
-  metadata.gz: 9d06ced474ac3f829e0d8ad8b3d87ce91b095f70c58579d68116dc25a59128ee97c67cf947bbf2502a9f60d46f710030eed1b7cec9efabf165d6d954337574a6
-  data.tar.gz: d1235b61f7c32bf0b4c81973e317218d700a23dfe4cca346b841a6b3ce04e0fbec6836d9dab57c17557230de3039914150b08b24e303049f65e6cd0e9c6645a5
+  metadata.gz: 5009a521e15fc1b6d0d618e3b267f93671d92f2f457693f5b4ee7732e87037e3f47c434f941531d611b08d3678d581a2445a4cc5aa3b86e2613d8c2361ce061c
+  data.tar.gz: 38f4fa38b70c23e68ec60aec1f9fdf45bb3067bb2e6eb90d3aeb6fb0015911b10c8fcc66538bd95357de13b6657b8e6b0eae5eb53a5b801a5203ef87aae1fa2f

data/app/models/concerns/foreman_azure_rm/vm_extensions/managed_vm.rb

@@ -88,6 +88,8 @@ module ForemanAzureRM
                                   NetworkModels::IPAllocationMethod::Dynamic
                                 when 'None'
                                   nil
+                                else
+                                    raise RuntimeError, "Public IP value must be either 'Dynamic', 'Static' or 'None'"
                                 end
           if pub_ip_alloc.present?
             public_ip_params = NetworkModels::PublicIPAddress.new.tap do |ip|
@@ -108,6 +110,7 @@ module ForemanAzureRM
                 NetworkModels::NetworkInterfaceIPConfiguration.new.tap do |nic_conf|
                   nic_conf.name = "#{args[:vm_name]}-nic#{nic}"
                   nic_conf.private_ipallocation_method = priv_ip_alloc
+                  nic_conf.private_ipaddress = attrs[:ip] if priv_ip_alloc == "Static"
                   nic_conf.subnet = subnets.select{ |subnet| subnet.id == attrs[:network] }.first
                   nic_conf.public_ipaddress = pip
                 end
@@ -216,4 +219,4 @@ module ForemanAzureRM
       end
     end
   end
-end
+end

data/app/models/foreman_azure_rm/azure_rm.rb

@@ -59,7 +59,7 @@ module ForemanAzureRM
       [:image]
     end
 
-    def regions
+    def self.regions
       [
           ['West Europe', 'westeurope'],
           ['Central US', 'centralus'],
@@ -73,6 +73,9 @@ module ForemanAzureRM
       ]
     end
 
+    validates :region, inclusion: { in: regions.collect(&:second),
+    message: "%{value} must be lowercase." }
+
     def resource_groups
       sdk.rgs
     end

data/app/models/foreman_azure_rm/azure_rm_compute.rb

@@ -44,6 +44,9 @@ module ForemanAzureRM
       vm_status == 'running'
     end
 
+    def reload
+    end
+
     def state
       vm_status
     end
@@ -116,6 +119,10 @@ module ForemanAzureRM
       @azure_vm.name = setuuid
     end
 
+    def vm_description
+        _("%{vm_size} VM Size") % {:vm_size => vm_size}
+    end
+
     # Following properties are for AzureRM
     # These are not part of Foreman's interface
 

data/app/views/compute_resources/form/_azurerm.html.erb

@@ -3,7 +3,7 @@
 <%= text_f f, :user, :label => _('Subscription ID'), :required => true %>
 <%= text_f f, :uuid, :label => _('Tenant ID'), :required => true %>
 
-<%= selectable_f(f, :url, f.object.regions, {}, {:label => _('Azure Region'), :required => true }) %>
+<%= selectable_f(f, :url, f.object.class.regions, {}, {:label => _('Azure Region'), :required => true }) %>
 
 <div class="col-md-offset-2">
     <%= test_connection_button_f(f, true) %>

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

@@ -176,12 +176,6 @@
          }
 %>
 
-<% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1'
-%>
-
-<%= checkbox_f f, :start, { :checked => (checked == '1'), :help_inline => _("Power ON this machine upon creation"), :label => _('Start'), :label_size => "col-md-2" } if new_vm && controller_name != "compute_attributes" 
-%>
-
 <div id="image_selection">
   <%= select_f f, :image_id, images, :uuid, :name,
                { :include_blank => (images.empty? or images.size == 1) ? false : _('Please select an image') },

data/app/views/compute_resources_vms/index/_azurerm.html.erb

@@ -19,6 +19,7 @@
       <td>
         <%= action_buttons(
                 vm_power_action(vm, authorizer),
+                vm_import_action(vm),
                 display_delete_if_authorized(hash_for_compute_resource_vm_path(
                     :compute_resource_id => @compute_resource,
                     :id => vm.identity).merge(:auth_object => @compute_resource, :authorizer => authorizer))

data/app/views/images/form/_azurerm.html.erb

@@ -1,6 +1,6 @@
 <%= text_f f, :username, :value => @image.username || "root",
            :help_inline         => _("The user that will be used to SSH into the VM for completion")
 %>
-<%= password_f f, :password, :help_inline => _("Password to authenticate with - used for SSH finish step.") %>
+<%= password_f f, :password, :keep_value => true, :help_inline => _("Password to authenticate with - used for SSH finish step.") %>
 <%= image_field(f, :label => _("Marketplace Image URN"), :help_inline => _("Marketplace URN (e.g. OpenLogic:CentOS:7.5:latest)")) %>
 <%= checkbox_f f, :user_data, :help_inline => _("Does this image support user data input?") %>

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRM
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure_rm
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Azure Resource Manager as a compute resource for The Foreman