foreman_azure_rm 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e741ec81cb86b9264c85d90144d72b977041fa7862719a2ffefb3ee0a08e091
-  data.tar.gz: 1f650dc025e09281b48651d5b51a67a90fa406dd94adaddc8fe0cff66a1aa30d
+  metadata.gz: 910b1dd793ab445a40152db2f4613550f39d846cb53603da5a1b80cbd785f832
+  data.tar.gz: ed13a2dd55819f1c12f6c572173108b300c6ac456ec9d788507b68cf171c0260
 SHA512:
-  metadata.gz: 87b2e1e4f809356ad3366b13b61e317f038b292e138431746f6d3360b45075326b3e220e2c53aa8f718985b18d9c414cd18a42ecdea4670ded22d41c741a6fd6
-  data.tar.gz: 560fd23c83eeef07f8669edd5380d5ee51312000640e3c31c7779e546d00288527bb6d38cc4c83e4693dae0edec268b01192047fc630d725d44a87225a5599b1
+  metadata.gz: 8876efb62862f4d57684d620a91ee740459187e3e7b64cf35da8d12473fde4189902a8a88ec0bb6aca6c6f3785b79cb1973b12a2d2cf00f7b5ff15aa27a0a7c0
+  data.tar.gz: 79b0e983f67fe039698c1ecb7ae2699435049d26aec02ed2389299492113c26e197e4366aac740bafd5e4b9251a18a7e3912fd65daf43628186c54cf83c78a26

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

@@ -21,10 +21,10 @@ module ForemanAzureRm
                                 ComputeModels::CachingTypes::ReadOnly
                               when 'ReadWrite'
                                 ComputeModels::CachingTypes::ReadWrite
-                              else
-                                # ARM best practices stipulate RW caching on the OS disk
-                                ComputeModels::CachingTypes::ReadWrite
                             end
+                          else
+                            # ARM best practices stipulate RW caching on the OS disk
+                            ComputeModels::CachingTypes::ReadWrite
                           end
         managed_disk_params.storage_account_type = if premium_os_disk == 'true'
                                                      ComputeModels::StorageAccountTypes::PremiumLRS
@@ -46,25 +46,25 @@ module ForemanAzureRm
         image_reference
       end
 
-      def define_image(vhd_path)
+      def define_image(image_id)
         # If image UUID begins with / it is a custom managed image
         # Otherwise it is a marketplace URN
-        unless vhd_path.start_with?('/')
-          urn = vhd_path.split(':')
+        unless image_id.start_with?('/')
+          urn = image_id.split(':')
           publisher = urn[0]
           offer     = urn[1]
           sku       = urn[2]
           version   = urn[3]
-          vhd_path = nil
+          image_id = nil
         end
 
-        if vhd_path.nil?
+        if image_id.nil?
           # For marketplace image
           image_reference = marketplace_image_reference(publisher, offer, sku, version)
         else
           # For custom managed image
           image_ref = ComputeModels::ImageReference.new
-          image_ref.id = vhd_path
+          image_ref.id = image_id
           image_reference = image_ref
         end
         image_reference
@@ -189,7 +189,7 @@ module ForemanAzureRm
       def create_managed_virtual_machine(vm_hash)
         vm_params = initialize_vm(vm_hash)
         vm_params.network_profile = define_network_profile(vm_hash[:network_interface_card_ids])
-        vm_params.storage_profile.image_reference = define_image(vm_hash[:vhd_path])
+        vm_params.storage_profile.image_reference = define_image(vm_hash[:image_id])
         sdk.create_or_update_vm(vm_hash[:resource_group], vm_hash[:name], vm_params)
       end
 

data/app/models/foreman_azure_rm/azure_rm.rb

@@ -112,7 +112,7 @@ module ForemanAzureRm
           ifaces << new_interface(iface_attrs)
         end
       end
-      AzureRmCompute.new(azure_vm: raw_vm ,sdk: sdk, resource_group: opts[:resource_group], nics: ifaces)
+      AzureRmCompute.new(azure_vm: raw_vm ,sdk: sdk, resource_group: opts[:resource_group], nics: ifaces, script_command: opts[:script_command], script_uris: opts[:script_uris])
     end
 
     def provided_attributes
@@ -207,10 +207,14 @@ module ForemanAzureRm
       args[:vm_name] = args[:name].split('.')[0]
       nics = create_nics(region, args)
       if args[:password].present? && !args[:ssh_key_data].present?
+        # Any change to sudoers_cmd and formation of new
+        # args[:script_command] must be accordingly changed
+        # in script_command method in AzureRmCompute class
         sudoers_cmd = "$echo #{args[:password]} | sudo -S echo '\"#{args[:username]}\" ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/waagent"
         if args[:script_command].present?
           # to run the script_cmd given through form as username
-          args[:script_command] =  sudoers_cmd + " ; su - \"#{args[:username]}\" -c \"#{args[:script_command]}\""
+          user_command = args[:script_command]
+          args[:script_command] =  sudoers_cmd + " ; su - \"#{args[:username]}\" -c \"#{user_command}\""
         else
           args[:script_command] =  sudoers_cmd
         end
@@ -232,7 +236,7 @@ module ForemanAzureRm
         disable_password_authentication: disable_password_auth,
         network_interface_card_ids:      nics.map(&:id),
         platform:                        args[:platform],
-        vhd_path:                        args[:image_id],
+        image_id:                        args[:image_id],
         os_disk_caching:                 args[:os_disk_caching],
         premium_os_disk:                 args[:premium_os_disk],
         custom_data:                     args[:user_data],
@@ -242,7 +246,7 @@ module ForemanAzureRm
       logger.debug "Virtual Machine #{args[:vm_name]} Created Successfully."
       create_vm_extension(region, args)
       # return the vm object using azure_vm
-      AzureRmCompute.new(azure_vm: vm, sdk: sdk, resource_group: args[:resource_group], nics: vm_nics(vm))
+      AzureRmCompute.new(azure_vm: vm, sdk: sdk, resource_group: args[:resource_group], nics: vm_nics(vm), script_command: user_command, script_uris: args[:script_uris])
     rescue RuntimeError => e
       Foreman::Logging.exception('Unhandled AzureRm error', e)
       destroy_vm vm.id if vm

data/app/models/foreman_azure_rm/azure_rm_compute.rb

@@ -4,19 +4,23 @@ module ForemanAzureRm
     attr_accessor :azure_vm
     attr_accessor :resource_group
     attr_accessor :nics
-    attr_accessor :image_id
+    attr_accessor :script_command, :script_uris
 
     delegate :name, to: :azure_vm, allow_nil: true
 
     def initialize(azure_vm: ComputeModels::VirtualMachine.new,
                    sdk: sdk,
                    resource_group: azure_vm.resource_group,
-                   nics: [])
+                   nics: [],
+                   script_command: nil,
+                   script_uris: nil)
 
       @azure_vm = azure_vm
       @sdk = sdk
       @resource_group ||= resource_group
       @nics ||= nics
+      @script_command ||= script_command
+      @script_uris ||= script_uris
       @azure_vm.hardware_profile ||= ComputeModels::HardwareProfile.new
       @azure_vm.os_profile ||= ComputeModels::OSProfile.new
       @azure_vm.os_profile.linux_configuration ||= ComputeModels::LinuxConfiguration.new
@@ -162,10 +166,42 @@ module ForemanAzureRm
       @azure_vm.storage_profile.os_disk.caching
     end
 
+    def image_uuid
+      image = @azure_vm.storage_profile.image_reference
+      return nil unless image
+      "#{image.publisher}:#{image.offer}:#{image.sku}:#{image.version}"
+    end
+
+    alias_method :image_id, :image_uuid
+
+    def vm_extension
+      return nil unless @azure_vm.resources
+      @vm_extension ||= begin
+        ext_name = @azure_vm.resources.first.id.split('/')[-1]
+        sdk.get_vm_extension(@azure_vm.resource_group, name, ext_name)
+      end
+    end
+
     def script_command
+      if vm_extension.present?
+        return @script_command if vm_extension.settings["commandToExecute"].ends_with?("waagent")
+        # Index is based on script_command that is being injected
+        # from the code in #create_vm. It can be partly hard-coded
+        # since the command shall no change frequently.
+        user_cmd_index = (vm_extension.settings["commandToExecute"].index("-c"))+ 4
+        script_command = vm_extension.settings["commandToExecute"][user_cmd_index..-2]
+      else
+        @script_command
+      end
     end
 
     def script_uris
+      if vm_extension.present?
+        return @script_uris unless vm_extension.settings["fileUris"]
+        script_uris = vm_extension.settings["fileUris"]
+      else
+        @script_uris
+      end
     end
   end
 end

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

@@ -155,10 +155,10 @@
 %>
 
 <%= selectable_f f, :os_disk_caching, %w(None ReadOnly ReadWrite),
-               {},
+               {   :include_blank => _('Please select OS Disk Caching method') },
                {
                    :label    => _('OS Disk Caching'),
-                   :required => true,
+                   :label_help => _("Default ReadWrite"),
                    :class    => "col-md-2"
                }
 %>
@@ -166,7 +166,7 @@
 <%= text_f f, :script_command,
          {
              :label => _('Custom Script Command'),
-             :help_inline => _("To perform commands as root, prefix it with 'sudo'.")
+             :label_help => _("To perform commands as root, prefix it with 'sudo'")
          }
 %>
 
@@ -183,6 +183,7 @@
                    :disabled   => images.empty?,
                    :label      => _('Image'),
                    :required   => true,
+                   :selected   => f.object.image_id,
                    :label_size => "col-md-2",
                    :id         => 'azure_rm_image_id'
                } if controller_name != "compute_attributes"

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

@@ -11,7 +11,7 @@
   </thead>
   <% @vms.each do |vm| %>
     <tr>
-      <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity).merge(:auth_object => @compute_resource, :authorizer => :authorizer) %></td>
+      <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity).merge(:auth_object => @compute_resource) %></td>
       <td><%= vm.vm_size %></td>
       <td><%= vm.resource_group %></td>
       <td><%= vm.azure_vm.location %></td>

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

@@ -6,21 +6,25 @@
     </thead>
     <tbody>
       <tr>
-        <td>Id</td>
-        <td><%=@vm.id%></td>
+        <td>VM Size</td>
+        <td><%=@vm.vm_size%></td>
       </tr>
       <tr>
         <td>Location</td>
         <td><%=@vm.azure_vm.location%></td>
       </tr>
-      <tr>
-        <td>VM Size</td>
-        <td><%=@vm.vm_size%></td>
-      </tr>
       <tr>
         <td>Platform</td>
         <td><%=@vm.azure_vm.storage_profile.os_disk.os_type%></td>
       </tr>
+      <tr>
+        <td>Public IP address</td>
+        <td><%=@vm.public_ip_address%></td>
+      </tr>
+      <tr>
+        <td>Private IP address</td>
+        <td><%=@vm.private_ip_address%></td>
+      </tr>
     </tbody>
   </table>
 </div>

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRm
-  VERSION = '2.0.5'.freeze
+  VERSION = '2.0.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure_rm
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface