foreman_azure_rm 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24ded44e5ec295b20033b5c0903fecaa55637c19f4fdeaf95a37a03397073fd0
-  data.tar.gz: cb9f2190045dd7d32909e107c55663887561f9545b3327f3aca0930ae8b069e1
+  metadata.gz: 1e741ec81cb86b9264c85d90144d72b977041fa7862719a2ffefb3ee0a08e091
+  data.tar.gz: 1f650dc025e09281b48651d5b51a67a90fa406dd94adaddc8fe0cff66a1aa30d
 SHA512:
-  metadata.gz: 982ed4a40ec28d77728dd7d0f201c8783d53b29854c39f46a9295a6883df3ed0e728e8cae8a2239597f8439d67ee7d316f8f61d81675752361fd3051f8b9f7fb
-  data.tar.gz: 9076e42d4cadbcc931f1ff2ccf61c8df068ad80534d6e9dfbe6f70de655b656de5fd68abd25f5e7c3c6cbbdb937fa93d5c930a23e45a6ab82a52a5784403006a
+  metadata.gz: 87b2e1e4f809356ad3366b13b61e317f038b292e138431746f6d3360b45075326b3e220e2c53aa8f718985b18d9c414cd18a42ecdea4670ded22d41c741a6fd6
+  data.tar.gz: 560fd23c83eeef07f8669edd5380d5ee51312000640e3c31c7779e546d00288527bb6d38cc4c83e4693dae0edec268b01192047fc630d725d44a87225a5599b1

data/README.md

@@ -6,6 +6,49 @@
 * Website: [TheForeman.org](http://theforeman.org)
 * Support: [Foreman support](http://theforeman.org/support.html)
 
+## Installation
+
+### Bundle (Gem)
+
+Add the following to bundler.d/Gemfile.local.rb in your Foreman installation directory (/usr/share/foreman by default)
+
+```bash
+$ gem 'foreman_azure_rm'
+```
+
+Or simply:
+
+```bash
+$ echo "gem 'foreman_azure_rm'" > /usr/share/foreman/bundler.d/Gemfile.local.rb
+```
+
+Then run `bundle install` from the same directory
+
+### Package
+```
+# yum install tfm-rubygem-foreman_azure_rm
+```
+
+### Foreman Installer
+```
+# foreman-installer --enable-foreman-plugin-azure
+```
+
+### Development Setup
+
+Clone the repo from github:
+```bash
+git clone https://github.com/theforeman/foreman_azure_rm.git
+```
+
+Add the following to bundler.d/Gemfile.local.rb in your Foreman development directory
+
+```ruby
+$ gem 'foreman_azure_rm', :path => 'path to foreman_azure_rm directory'
+```
+
+Then run `bundle install` from the same directory
+
 ## Features
 * Support for most typical IaaS operations
     * VM creation
@@ -28,13 +71,13 @@ Choose the **Azure Resource Manager provider**, and fill in all the fields. You
 That's it. You're now ready to create and manage Azure resources in your new Azure Resource Manager compute resource. You should see something like this in the Compute Resource page:
 
 
-![](https://i.imgur.com/9J7tPJa.png)
+![](https://i.imgur.com/4ClZhTP.png)
 
 
 ![](https://i.imgur.com/eFHucdb.png)
 
 
-![](https://i.imgur.com/RTBlMeE.png)
+![](https://i.imgur.com/YjlRQIE.png)
 
     
 ## Planned Features
@@ -45,6 +88,7 @@ That's it. You're now ready to create and manage Azure resources in your new Azu
 * Improved extension support    
     
 ## Known Limitations
+* Please note that currently username is expected to be the same on both Virtual Machine tab for Host creation and during Image creation for Compute Resource. The password field for Image creation is optional.
 * Unable to provision using Windows Images
 
 ## Links

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

@@ -4,8 +4,7 @@ module ForemanAzureRm
     module ManagedVM
       extend ActiveSupport::Concern
 
-      def define_managed_storage_profile(vm_name, vhd_path, publisher, offer, sku, version,
-                                           os_disk_caching, platform, premium_os_disk)
+      def define_managed_storage_profile(vm_name, os_disk_caching, platform, premium_os_disk)
         storage_profile = ComputeModels::StorageProfile.new
         os_disk = ComputeModels::OSDisk.new
         managed_disk_params = ComputeModels::ManagedDiskParameters.new
@@ -35,22 +34,10 @@ module ForemanAzureRm
         os_disk.managed_disk = managed_disk_params
         storage_profile.os_disk = os_disk
 
-        # TODO - disk creation for volume capability
-
-        if vhd_path.nil?
-          # We are using a marketplace image
-          storage_profile.image_reference = image_reference(publisher, offer,
-                                                            sku, version)
-        else
-          # We are using a custom managed image
-          image_ref = ComputeModels::ImageReference.new
-          image_ref.id = vhd_path
-          storage_profile.image_reference = image_ref
-        end
         storage_profile
       end
 
-      def image_reference(publisher, offer, sku, version)
+      def marketplace_image_reference(publisher, offer, sku, version)
         image_reference = ComputeModels::ImageReference.new
         image_reference.publisher = publisher
         image_reference.offer = offer
@@ -59,6 +46,30 @@ module ForemanAzureRm
         image_reference
       end
 
+      def define_image(vhd_path)
+        # 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(':')
+          publisher = urn[0]
+          offer     = urn[1]
+          sku       = urn[2]
+          version   = urn[3]
+          vhd_path = nil
+        end
+
+        if vhd_path.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_reference = image_ref
+        end
+        image_reference
+      end
+
       def define_network_profile(network_interface_card_ids)
         network_interface_cards = []
         network_interface_card_ids.each_with_index do |id, index|
@@ -133,16 +144,6 @@ module ForemanAzureRm
             sub_resource.id = vm_hash[:availability_set_id]
             vm.availability_set = sub_resource
           end
-          # If image UUID begins with / it is a custom managed image
-          # Otherwise it is a marketplace URN
-          unless vm_hash[:vhd_path].start_with?('/')
-            urn = vm_hash[:vhd_path].split(':')
-            vm_hash[:publisher] = urn[0]
-            vm_hash[:offer]     = urn[1]
-            vm_hash[:sku]       = urn[2]
-            vm_hash[:version]   = urn[3]
-            vm_hash[:vhd_path] = nil
-          end
 
           vm.os_profile = ComputeModels::OSProfile.new.tap do |os_profile|
             os_profile.computer_name  = vm_hash[:name]
@@ -173,14 +174,9 @@ module ForemanAzureRm
           end
           vm.storage_profile = define_managed_storage_profile(
                                                                 vm_hash[:name],
-                                                                vm_hash[:vhd_path],
-                                                                vm_hash[:publisher],
-                                                                vm_hash[:offer],
-                                                                vm_hash[:sku],
-                                                                vm_hash[:version],
                                                                 vm_hash[:os_disk_caching],
                                                                 vm_hash[:platform],
-                                                                vm_hash[:premium_os_disk],
+                                                                vm_hash[:premium_os_disk]
                                                               )
           vm.hardware_profile = ComputeModels::HardwareProfile.new.tap do |hw_profile|
             hw_profile.vm_size = vm_hash[:vm_size]
@@ -193,6 +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])
         sdk.create_or_update_vm(vm_hash[:resource_group], vm_hash[:name], vm_params)
       end
 

data/app/models/foreman_azure_rm/azure_rm.rb

@@ -74,7 +74,7 @@ module ForemanAzureRm
     end
 
     validates :region, inclusion: { in: regions.collect(&:second),
-    message: "%{value} must be lowercase." }
+    message: "%{value} must be lowercase eg. 'eastus'. No special characters allowed." }
 
     def resource_groups
       sdk.rgs
@@ -88,7 +88,7 @@ module ForemanAzureRm
     end
 
     def new_vm(args = {})
-      return AzureRmCompute.new(sdk: sdk) if args.empty? || args[:image_id].nil?
+      return AzureRmCompute.new(sdk: sdk) if args.empty?
       opts = vm_instance_defaults.merge(args.to_h).deep_symbolize_keys
       # convert rails nested_attributes into a plain hash
       nested_args = opts.delete(:interfaces_attributes)
@@ -104,7 +104,6 @@ module ForemanAzureRm
                              platform:        opts[:platform],
                              ssh_key_data:    opts[:ssh_key_data],
                              os_disk_caching: opts[:os_disk_caching],
-                             vhd_path:        opts[:image_id],
                              premium_os_disk: opts[:premium_os_disk]
                             )
       if opts[:interfaces].present?

data/app/models/foreman_azure_rm/azure_rm_compute.rb

@@ -61,6 +61,10 @@ module ForemanAzureRm
       true
     end
 
+    def to_s
+      name
+    end
+
     def vm_status
       sdk.check_vm_status(@azure_vm.resource_group, name)
     end

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

@@ -88,7 +88,7 @@
 <% # This view has been modified and refers to the properties wrapper class %>
 
 <%= selectable_f f, :resource_group, resource_groups,
-               { :include_blank => true },
+               { :include_blank => _('Please select a Resource Group') },
                {
                    :disabled => resource_groups.empty?,
                    :label    => _('Resource Group'),
@@ -106,7 +106,7 @@
 %>
 
 <%= selectable_f f, :vm_size, compute_resource.vm_sizes.map { |size| size.name },
-               {},
+               { :include_blank => _('Please select a VM Size') },
                {
                    :label    => _('VM Size'),
                    :required => true,
@@ -185,6 +185,6 @@
                    :required   => true,
                    :label_size => "col-md-2",
                    :id         => 'azure_rm_image_id'
-               }
+               } if controller_name != "compute_attributes"
   %>
 </div>

data/lib/foreman_azure_rm/version.rb

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

metadata

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