foreman_azure_rm 2.1.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56702d3d39f9bc9753e04e4681b4607d073cc913c1625835dda252a8a575cb6a
-  data.tar.gz: 59999cc6458945958f13933a0a9c1b08b63d8ddad0cb6ece337b86e367948190
+  metadata.gz: 29c728e81ac2e3c154212c1111ce0b0fa018ebfe33ae4e449c456c3a08013dca
+  data.tar.gz: fa67a435918ba3580f4fe0d74b493626d130b3a67d0eabf140de5103590afe09
 SHA512:
-  metadata.gz: beb3b60d5c7790ff3063c67634d749fa5ca13148bde4197e40f0d5014ec3bdab94956688b5a6de21fa13ee40e0edf76bccd7ce2fa6e1ebcd6be7fafb9f79057a
-  data.tar.gz: c4e0e9857dfe71bc31d09275c012ed263dde09e25d98ea5d32c75a8be812f8a325a0d5f2e9880f6a84109c9f8a6f2ff3ee5db0e1079b969c27102cd84fc2d54e
+  metadata.gz: 305ea84bed5a5fff7313fc02febfbfff7407c9b0f7588670fef97065e8c78cb2d5e34b8932ee324b3052f06d97fd6455e8d2e5890c5f8322fc6530bd12f5905b
+  data.tar.gz: 07ed5bc2005637ba507ea057625794c082a40a19e083792b92de224318e9f477973a8c9df71cd6587af805b913a91c9f544f4527ffb5d883bcb1eac3d6701a2a

data/README.md

@@ -4,6 +4,7 @@
 ```foreman_azure_rm``` adds [Microsoft Azure Resource Manager](http://azure.com/) as a compute resource for The Foreman
 
 * Website: [TheForeman.org](http://theforeman.org)
+* ForemanAzureRm: [Plugin manual](https://theforeman.org/plugins/foreman_azure)
 * Support: [Foreman support](http://theforeman.org/support.html)
 
 ## Installation
@@ -12,25 +13,25 @@
 
 Add the following to bundler.d/Gemfile.local.rb in your Foreman installation directory (/usr/share/foreman by default)
 
-```bash
+```console
 $ gem 'foreman_azure_rm'
 ```
 
 Or simply:
 
-```bash
+```console
 $ echo "gem 'foreman_azure_rm'" > /usr/share/foreman/bundler.d/Gemfile.local.rb
 ```
 
 Then run `bundle install` from the same directory
 
 ### Package
-```
+```console
 # yum install tfm-rubygem-foreman_azure_rm
 ```
 
 ### Foreman Installer
-```
+```console
 # foreman-installer --enable-foreman-plugin-azure
 ```
 
@@ -44,7 +45,7 @@ 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'
+gem 'foreman_azure_rm', :path => 'path to foreman_azure_rm directory'
 ```
 
 Then run `bundle install` from the same directory
@@ -54,14 +55,19 @@ Then run `bundle install` from the same directory
     * VM creation
     * Provisions using Finish and User data templates from Foreman
     * Supports cloud-config provisioning
-    * Currently supports single NIC
-    * Currently supports single default OS Disk
     * Currently supports only provisioning of Linux platforms
     * Provisioning using [Public Images](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/cli-ps-findimage)
+    * Provision using custom images
+    * Provision using shared image galleries
+    * Provision using RHEL byos images
+    * Multiple NICs support
+    * Support to add multiple data disks/volumes (standard or premium)
+    * VM Extension with Custom Script and File URIs support
     * Static or dynamic addresses on a per NIC basis
 * Limited extension support
     * Microsoft's custom script extension
     * Puppet Lab's Puppet agent extension for Windows
+* Azure Gov Cloud Support
 
 ## Configuration
 Go to **Infrastructure > Compute Resources** and click on "New Compute Resource".
@@ -71,25 +77,20 @@ 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/4ClZhTP.png)
+![](https://i.imgur.com/vsamP4G.png)
 
 
-![](https://i.imgur.com/eFHucdb.png)
+![](https://i.imgur.com/Ag9tH55.png)
 
 
-![](https://i.imgur.com/YjlRQIE.png)
+![](https://i.imgur.com/fNjlFci.png)
 
     
 ## Planned Features
-* Multiple NICs support
-* Support to add multiple data disks (standard or premium)
-* Provision using custom images
-* Provision using shared image galleries
-* Improved extension support    
+* Support for http_proxy
     
 ## 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
 * [Issue tracker](https://projects.theforeman.org/projects/azurerm)

data/app/controllers/foreman_azure_rm/concerns/compute_resources_controller_extensions.rb

@@ -10,6 +10,7 @@ module ForemanAzureRm
           param :app_ident, String, :desc => N_("Client ID for AzureRm")
           param :secret_key, String, :desc => N_("Client Secret for AzureRm")
           param :sub_id, String, :desc => N_("Subscription ID for AzureRm")
+          param :cloud, String, :desc => N_("Cloud")
         end
       end
 

data/app/helpers/azure_compute_resource_helper.rb

@@ -10,8 +10,7 @@ module AzureComputeResourceHelper
     end
     selectable_f(f, :url, regions, {}, {:label => _('Azure Region'), :disabled => regions.empty?, :required => true, :help_inline_permanent => load_button_f(f, regions.present?, _("Load Regions")) })
   end
-  def azure_doc_url
+  def azure_doc_version
     doc_version = Foreman::Plugin.find(:foreman_azure_rm).version.scan(/\d+\.\d+/).first + '.x'
-    "https://theforeman.org/plugins/foreman_azure/#{doc_version}"
   end
 end

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

@@ -4,7 +4,7 @@ module ForemanAzureRm
     module ManagedVM
       extend ActiveSupport::Concern
 
-      def define_managed_storage_profile(vm_name, os_disk_caching, platform, premium_os_disk)
+      def define_managed_storage_profile(vm_name, os_disk_caching, platform, premium_os_disk, os_disk_size_gb)
         storage_profile = ComputeModels::StorageProfile.new
         os_disk = ComputeModels::OSDisk.new
         managed_disk_params = ComputeModels::ManagedDiskParameters.new
@@ -12,6 +12,7 @@ module ForemanAzureRm
         # Create OS disk
         os_disk.name = "#{vm_name}-osdisk"
         os_disk.os_type = platform
+        os_disk.disk_size_gb = os_disk_size_gb
         os_disk.create_option = ComputeModels::DiskCreateOptionTypes::FromImage
         os_disk.caching = disk_caching(os_disk_caching)
         managed_disk_params.storage_account_type = if premium_os_disk == 'true'
@@ -59,6 +60,21 @@ module ForemanAzureRm
         end
       end
 
+      def marketplace_image_plan(image)
+        image_type, image_id = image.split('://')
+        return nil unless image_type == 'marketplace' && image_id.include?('byos')
+        urn = image_id.split(':')
+        publisher = urn[0]
+        offer     = urn[1]
+        sku       = urn[2]
+        version   = urn[3]
+        image_plan = ComputeModels::PurchasePlan.new
+        image_plan.publisher = publisher.downcase
+        image_plan.name = sku.downcase
+        image_plan.product = offer.downcase
+        image_plan
+      end
+
       def marketplace_image_reference(publisher, offer, sku, version)
         image_reference = ComputeModels::ImageReference.new
         image_reference.publisher = publisher
@@ -107,7 +123,7 @@ module ForemanAzureRm
       def create_nics(region, args = {})
         nics               = []
         args[:interfaces_attributes].each do |nic, attrs|
-          private_ip = (attrs[:private_ip] == 'false') ? false : true
+          private_ip = Foreman::Cast.to_bool(attrs[:private_ip])
           priv_ip_alloc       = if private_ip
                                   NetworkModels::IPAllocationMethod::Static
                                 else
@@ -172,21 +188,23 @@ module ForemanAzureRm
             os_profile.admin_password = vm_hash[:password]
 
             # Adding the ssh-key support for authentication
-            os_profile.linux_configuration = ComputeModels::LinuxConfiguration.new.tap do |linux|
-              linux.disable_password_authentication = vm_hash[:disable_password_authentication]
-              linux.ssh = ComputeModels::SshConfiguration.new.tap do |ssh_config|
-                ssh_config.public_keys = [
-                  ComputeModels::SshPublicKey.new.tap do |foreman_key|
-                    foreman_key.key_data = key_pair.public
-                    foreman_key.path = "/home/#{vm_hash[:username]}/.ssh/authorized_keys"
+            if vm_hash[:platform] == 'Linux'
+              os_profile.linux_configuration = ComputeModels::LinuxConfiguration.new.tap do |linux|
+                linux.disable_password_authentication = vm_hash[:disable_password_authentication]
+                linux.ssh = ComputeModels::SshConfiguration.new.tap do |ssh_config|
+                  ssh_config.public_keys = [
+                    ComputeModels::SshPublicKey.new.tap do |foreman_key|
+                      foreman_key.key_data = key_pair.public
+                      foreman_key.path = "/home/#{vm_hash[:username]}/.ssh/authorized_keys"
+                    end
+                  ]
+                  if vm_hash[:ssh_key_data].present?
+                    key_data = vm_hash[:ssh_key_data]
+                    pub_key = ComputeModels::SshPublicKey.new
+                    pub_key.key_data = key_data
+                    pub_key.path = "/home/#{vm_hash[:username]}/.ssh/authorized_keys"
+                    ssh_config.public_keys << pub_key
                   end
-                ]
-                if vm_hash[:ssh_key_data].present?
-                  key_data = vm_hash[:ssh_key_data]
-                  pub_key = ComputeModels::SshPublicKey.new
-                  pub_key.key_data = key_data
-                  pub_key.path = "/home/#{vm_hash[:username]}/.ssh/authorized_keys"
-                  ssh_config.public_keys << pub_key
                 end
               end
             end
@@ -197,7 +215,8 @@ module ForemanAzureRm
                                                                 vm_hash[:name],
                                                                 vm_hash[:os_disk_caching],
                                                                 vm_hash[:platform],
-                                                                vm_hash[:premium_os_disk]
+                                                                vm_hash[:premium_os_disk],
+                                                                vm_hash[:os_disk_size_gb]
                                                               )
           vm.hardware_profile = ComputeModels::HardwareProfile.new.tap do |hw_profile|
             hw_profile.vm_size = vm_hash[:vm_size]
@@ -209,6 +228,7 @@ module ForemanAzureRm
 
       def create_managed_virtual_machine(vm_hash)
         vm_params = initialize_vm(vm_hash)
+        vm_params.plan = marketplace_image_plan(vm_hash[:image_id])
         vm_params.network_profile = define_network_profile(vm_hash[:network_interface_card_ids])
         vm_params.storage_profile.image_reference = define_image(vm_hash[:resource_group], vm_hash[:image_id])
         vm_params.storage_profile.data_disks = define_data_disks(vm_hash[:name], vm_hash[:data_disks])
@@ -219,11 +239,22 @@ module ForemanAzureRm
         if args[:script_command].present? || args[:script_uris].present?
           args[:script_uris] ||=  args[:script_uris].to_s
           extension = ComputeModels::VirtualMachineExtension.new
-          if args[:platform] == 'Linux'
+
+          case args[:platform]
+          # https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/custom-script-linux
+          when 'Linux'
             extension.publisher = 'Microsoft.Azure.Extensions'
             extension.virtual_machine_extension_type = 'CustomScript'
             extension.type_handler_version = '2.0'
+          # https://docs.microsoft.com/en-us/azure/virtual-machines/extensions/custom-script-windows
+          when 'Windows'
+            extension.publisher = 'Microsoft.Compute'
+            extension.virtual_machine_extension_type = 'CustomScriptExtension'
+            extension.type_handler_version = '1.10'
+          else
+            raise RuntimeError, "Unsupported platform #{args[:platform]}"
           end
+
           extension.auto_upgrade_minor_version = true
           extension.location = region
           extension.settings = {

data/app/models/foreman_azure_rm/azure_rm.rb

@@ -11,6 +11,7 @@ module ForemanAzureRm
     alias_attribute :secret_key, :password
     alias_attribute :region, :url
     alias_attribute :tenant, :uuid
+    alias_attribute :azure_environment, :cloud
 
     validates :user, :password, :uuid, :app_ident, :presence => true
 
@@ -41,8 +42,16 @@ module ForemanAzureRm
       attrs[:app_ident] = name
     end
 
+    def cloud
+      attrs[:cloud] || 'azure'
+    end
+
+    def cloud=(name)
+      attrs[:cloud] = name
+    end
+
     def sdk
-      @sdk ||= ForemanAzureRm::AzureSdkAdapter.new(tenant, app_ident, secret_key, sub_id)
+      @sdk ||= ForemanAzureRm::AzureSdkAdapter.new(tenant, app_ident, secret_key, sub_id, azure_environment)
     end
     
     def to_label
@@ -81,7 +90,7 @@ module ForemanAzureRm
 
     def test_connection(options = {})
       super
-      errors[:user].empty? && errors[:password].empty? && errors[:uuid].empty? && errors[:app_ident].empty? && regions
+      errors[:user].empty? && errors[:password].empty? && errors[:uuid].empty? && errors[:app_ident].empty? && errors[:cloud].empty? && regions
     rescue StandardError => e
       errors[:base] << e.message
     rescue Excon::Error::Socket => e
@@ -106,7 +115,8 @@ module ForemanAzureRm
                              platform:        opts[:platform],
                              ssh_key_data:    opts[:ssh_key_data],
                              os_disk_caching: opts[:os_disk_caching],
-                             premium_os_disk: opts[:premium_os_disk]
+                             premium_os_disk: opts[:premium_os_disk],
+                             os_disk_size_gb: opts[:os_disk_size_gb]
                             )
       if opts[:interfaces].present?
         ifaces = []
@@ -259,23 +269,26 @@ module ForemanAzureRm
       args = args.to_h.deep_symbolize_keys
       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
-          user_command = args[:script_command]
-          args[:script_command] =  sudoers_cmd + " ; su - \"#{args[:username]}\" -c \"#{user_command}\""
+
+      if args[:platform] == 'Linux'
+        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
+            user_command = args[:script_command]
+            args[:script_command] =  sudoers_cmd + " ; su - \"#{args[:username]}\" -c \"#{user_command}\""
+          else
+            args[:script_command] =  sudoers_cmd
+          end
+          disable_password_auth = false
+        elsif args[:ssh_key_data].present? && !args[:password].present?
+          disable_password_auth = true
         else
-          args[:script_command] =  sudoers_cmd
+          disable_password_auth = false
         end
-        disable_password_auth = false
-      elsif args[:ssh_key_data].present? && !args[:password].present?
-        disable_password_auth = true
-      else
-        disable_password_auth = false
       end
 
       vm             = create_managed_virtual_machine(
@@ -292,6 +305,7 @@ module ForemanAzureRm
         image_id:                        args[:image_id],
         os_disk_caching:                 args[:os_disk_caching],
         premium_os_disk:                 args[:premium_os_disk],
+        os_disk_size_gb:                 args[:os_disk_size_gb],
         data_disks:                      args[:volumes_attributes],
         custom_data:                     args[:user_data],
         script_command:                  args[:script_command],

data/app/models/foreman_azure_rm/azure_rm_compute.rb

@@ -10,7 +10,7 @@ module ForemanAzureRm
     delegate :name, to: :azure_vm, allow_nil: true
 
     def initialize(azure_vm: ComputeModels::VirtualMachine.new,
-                   sdk: sdk,
+                   sdk: nil,
                    resource_group: azure_vm.resource_group,
                    nics: [],
                    volumes: [],
@@ -179,6 +179,10 @@ module ForemanAzureRm
       @azure_vm.storage_profile.os_disk.managed_disk.storage_account_type
     end
 
+    def os_disk_size_gb
+      @azure_vm.storage_profile.os_disk.disk_size_gb
+    end
+
     def os_disk_caching
       @azure_vm.storage_profile.os_disk.caching
     end

data/app/views/api/v2/compute_resources/azurerm.json.rabl

@@ -1 +1 @@
-attributes :tenant, :app_ident, :sub_id, :secret_key, :region
+attributes :cloud, :tenant, :app_ident, :sub_id, :region

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

@@ -1,5 +1,10 @@
-<%= text_f f, :app_ident, :label => _('Client ID'), :required => true, :help_inline => link_to(icon_text('help', _('Documentation'), :kind => 'pficon'),
-  azure_doc_url, :rel => 'external', :class => 'btn btn-default btn-docs', :target => '_blank') %>
+<%= selectable_f f, :cloud, [
+  ['Public / Standard', 'azure'],  
+  ['US Government', 'azureusgovernment'],
+  ['China', 'azurechina'],
+  ['Germany', 'azuregermancloud'],
+], {}, { :label => _('Cloud'), :required => true } %>
+<%= text_f f, :app_ident, :label => _('Client ID'), :required => true, :help_inline => link_to('Documentation', external_link_path(type: 'plugin_manual', name: 'foreman_azure', version: azure_doc_version), :kind => 'pficon', :rel => 'external', :class => 'btn btn-default btn-docs', :target => '_blank') %>
 <%= password_f f, :password, :label => _('Client Secret'), :keep_value => true, :required => true %>
 <%= text_f f, :user, :label => _('Subscription ID'), :required => true %>
 <%= text_f f, :uuid, :label => _('Tenant ID'), :required => true %>

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

@@ -132,7 +132,6 @@
 <%= password_f f, :password,
          {
              :label    => _('Password'),
-             :required => true,
              :placeholder => "********",
              :value => f.object.password
 
@@ -154,6 +153,16 @@
              'false'
 %>
 
+<%= number_f f, :os_disk_size_gb,
+         {
+             :label => _('Override OS Disk Size (GB)'),
+             :label_help => _("Leave empty to use default image size"),
+             :required => false,
+             :min => 1,
+             :class => "col-md-2",
+         }
+%>
+
 <%= selectable_f f, :os_disk_caching, %w(None ReadOnly ReadWrite),
                {   :include_blank => _("Azure's Default") },
                {

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

@@ -1,14 +1,14 @@
-<table class="table table-bordered" data-table="inline">
-  <thead>
-    <tr>
-      <th><%= _('Name') %></th>
-      <th><%= _('Size') %></th>
-      <th><%= _('Resource Group') %></th>
-      <th><%= _('Region') %></th>
-      <th><%= _('State') %></th>
-      <th><%= _('Actions') %></th>
-    </tr>
-  </thead>
+<thead>
+  <tr>
+    <th><%= _('Name') %></th>
+    <th><%= _('Size') %></th>
+    <th><%= _('Resource Group') %></th>
+    <th><%= _('Region') %></th>
+    <th><%= _('State') %></th>
+    <th><%= _('Actions') %></th>
+  </tr>
+</thead>
+<tbody>
   <% @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) %></td>
@@ -27,4 +27,4 @@
       </td>
     </tr>
   <% end %>
-</table>
+</tbody>

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

@@ -2,5 +2,5 @@
            :help_inline         => _("The user that will be used to SSH into the VM for completion")
 %>
 <%= password_f f, :password, :keep_value => true, :help_inline => _("Password to authenticate with - used for SSH finish step.") %>
-<%= image_field(f, :label => _("Azure Image Name"), :help_inline => _("For custom or shared gallery image prefix the uuid with 'custom://' or 'gallery://'. For public image, prefix the uuid with 'marketplace://'.' (e.g. 'marketplace://OpenLogic:CentOS:7.5:latest' or 'custom://image-name')")) %>
-<%= checkbox_f f, :user_data, :help_inline => _("Does this image support user data input?") %>
+<%= image_field(f, :label => _("Azure Image Name"), :help_inline => _("For custom or shared gallery image, use prefix 'custom://' or 'gallery://'. For public and RHEL-byos images, prefix the uuid with 'marketplace://'. (e.g. 'marketplace://OpenLogic:CentOS:7.5:latest' or 'custom://image-name')")) %>
+<%= checkbox_f f, :user_data, :help_inline => _("Does this image support user data input?") %>

data/lib/foreman_azure_rm/azure_sdk_adapter.rb

@@ -1,46 +1,87 @@
 module ForemanAzureRm
   class AzureSdkAdapter
-    def initialize(tenant, app_ident, secret_key, sub_id)
-      @tenant           = tenant
-      @app_ident        = app_ident
-      @secret_key       = secret_key
-      @sub_id           = sub_id
+    def initialize(tenant, app_ident, secret_key, sub_id, azure_environment)
+      @tenant               = tenant
+      @app_ident            = app_ident
+      @secret_key           = secret_key
+      @sub_id               = sub_id
+      @azure_environment    = azure_environment
+      @ad_settings          = ad_environment_settings(azure_environment)
+      @environment_settings = environment_settings(azure_environment)
     end
 
     def resource_client
-      @resource_client ||= Resources::Client.new(azure_credentials)
+      #resource_manager_endpoint_url
+      @resource_client ||= Resources::Client.new(azure_credentials(@environment_settings.resource_manager_endpoint_url))
     end
 
     def compute_client
-      @compute_client ||= Compute::Client.new(azure_credentials)
+      @compute_client ||= Compute::Client.new(azure_credentials(@environment_settings.resource_manager_endpoint_url))
     end
 
     def network_client
-      @network_client ||= Network::Client.new(azure_credentials)
+      @network_client ||= Network::Client.new(azure_credentials(@environment_settings.resource_manager_endpoint_url))
     end
 
     def storage_client
-      @storage_client ||= Storage::Client.new(azure_credentials)
+      @storage_client ||= Storage::Client.new(azure_credentials(@environment_settings.resource_manager_endpoint_url))
     end
 
     def subscription_client
-      @subscription_client ||= Subscriptions::Client.new(azure_credentials)
+      @subscription_client ||= Subscriptions::Client.new(azure_credentials(@environment_settings.resource_manager_endpoint_url))
     end
 
-    def azure_credentials
+    def azure_credentials(base_url)
       provider = MsRestAzure::ApplicationTokenProvider.new(
       @tenant,
       @app_ident,
-      @secret_key)
+      @secret_key,
+      @ad_settings)
       
       credentials = MsRest::TokenCredentials.new(provider)
 
       {
         credentials: credentials,
-        subscription_id: @sub_id
+        tenant_id: @tenant,
+        client_id: @app_ident,
+        client_secret: @secret_key,
+        subscription_id: @sub_id,
+        base_url: base_url
       }
     end
 
+    # https://github.com/Azure/azure-sdk-for-ruby/issues/850
+    # Retrieves a [MsRestAzure::ActiveDirectoryServiceSettings] object representing the settings for the given cloud.
+    # @param azure_environment [String] The Azure environment to retrieve settings for.
+    #
+    # @return [MsRestAzure::ActiveDirectoryServiceSettings] Settings to be used for subsequent requests
+    #
+    def ad_environment_settings(azure_environment)
+      case azure_environment.downcase
+      when 'azureusgovernment'
+        MsRestAzure::ActiveDirectoryServiceSettings.get_azure_us_government_settings
+      when 'azurechina'
+        MsRestAzure::ActiveDirectoryServiceSettings.get_azure_china_settings
+      when 'azuregermancloud'
+        MsRestAzure::ActiveDirectoryServiceSettings.get_azure_german_settings
+      when 'azure'
+        MsRestAzure::ActiveDirectoryServiceSettings.get_azure_settings
+      end
+    end
+
+    def environment_settings(azure_environment)
+      case azure_environment.downcase
+      when 'azureusgovernment'
+        MsRestAzure::AzureEnvironments::AzureUSGovernment
+      when 'azurechina'
+        MsRestAzure::AzureEnvironments::AzureChinaCloud
+      when 'azuregermancloud'
+        MsRestAzure::AzureEnvironments::AzureGermanCloud
+      when 'azure'
+        MsRestAzure::AzureEnvironments::AzureCloud
+      end
+    end
+
     def list_regions(subscription_id)
       subscription_client.subscriptions.list_locations(subscription_id)
     end

data/lib/foreman_azure_rm/engine.rb

@@ -11,7 +11,7 @@ module ForemanAzureRm
       Foreman::Plugin.register :foreman_azure_rm do
         requires_foreman '>= 1.17'
         compute_resource ForemanAzureRm::AzureRm
-        parameter_filter ComputeResource, :azure_vm, :tenant, :app_ident, :secret_key, :sub_id, :region
+        parameter_filter ComputeResource, :azure_vm, :tenant, :app_ident, :secret_key, :sub_id, :region, :cloud
       end
     end
 
@@ -42,7 +42,7 @@ module ForemanAzureRm
       require 'azure_mgmt_subscriptions'
 
       # Add format validation for azure images
-      ::Image.validates :uuid, format: { with: /\A((marketplace|custom|gallery):\/\/)[^:]+(:[^:]+:[^:]+:[^:]+)?\z/,
+      ::Image.validates :uuid, uniqueness: { scope: :compute_resource_id, case_sensitive: false }, format: { with: /\A((marketplace|custom|gallery):\/\/)[^:]+(:[^:]+:[^:]+:[^:]+)?\z/,
           message: "Incorrect UUID format" }, if: -> (image){ image.compute_resource.is_a? ForemanAzureRm::AzureRm }
 
       # Use excon as default so that HTTP Proxy settings of foreman works

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRm
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.2.4'.freeze
 end

data/locale/ko/foreman_azure_rm.po

@@ -7,9 +7,10 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2020
 # Bryan Kearney <bryan.kearney@gmail.com>, 2020
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.0.8\n"
+"Project-Id-Version: foreman_azure_rm 2.1.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-04-21 13:58+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2020\n"
@@ -24,7 +25,7 @@ msgid "%{vm_size} VM Size"
 msgstr ""
 
 msgid "Action with sub plans"
-msgstr ""
+msgstr "하위 계획이 있는 작업"
 
 msgid "Actions"
 msgstr "동작 "
@@ -78,13 +79,13 @@ msgid "Image"
 msgstr "이미지 "
 
 msgid "Import Puppet classes"
-msgstr ""
+msgstr "Puppet 클래스 가져오기"
 
 msgid "Import facts"
-msgstr ""
+msgstr "팩트 불러오기"
 
 msgid "Load Regions"
-msgstr ""
+msgstr "지역 로드 "
 
 msgid "Marketplace Image URN"
 msgstr ""
@@ -132,7 +133,7 @@ msgid "Reload Images, Sizes, vNets"
 msgstr ""
 
 msgid "Remote action:"
-msgstr ""
+msgstr "원격 작업:"
 
 msgid "Resource Group"
 msgstr ""

data/locale/nl_NL/foreman_azure_rm.po

@@ -7,9 +7,10 @@
 # Maxim Burgerhout <maxim@wzzrd.com>, 2020
 # EmielK <emiel@kremers.us>, 2020
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.0.8\n"
+"Project-Id-Version: foreman_azure_rm 2.1.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-04-21 13:58+0000\n"
 "Last-Translator: EmielK <emiel@kremers.us>, 2020\n"

data/locale/pl/foreman_azure_rm.po

@@ -7,9 +7,10 @@
 # sziolkow <sziolkow@gmail.com>, 2020
 # Michał Foryt <michal.foryt@gmail.com>, 2020
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.0.8\n"
+"Project-Id-Version: foreman_azure_rm 2.1.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-04-21 13:58+0000\n"
 "Last-Translator: Michał Foryt <michal.foryt@gmail.com>, 2020\n"
@@ -86,7 +87,7 @@ msgid "Import facts"
 msgstr ""
 
 msgid "Load Regions"
-msgstr ""
+msgstr "Załaduj regiony"
 
 msgid "Marketplace Image URN"
 msgstr ""

data/locale/pt_BR/foreman_azure_rm.po

@@ -4,18 +4,20 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 # Translators:
-# Flamarion Jorge <jorge.flamarion@gmail.com>, 2020
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2020
+# Bruno Emanuel Silva <bemanuel.pe@gmail.com>, 2020
+# Flamarion Jorge <jorge.flamarion@gmail.com>, 2020
 # Bryan Kearney <bryan.kearney@gmail.com>, 2020
 # Luiz Henrique Vasconcelos <luizvasconceloss@yahoo.com.br>, 2020
-# Bruno Emanuel Silva <bemanuel.pe@gmail.com>, 2020
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.0.8\n"
+"Project-Id-Version: foreman_azure_rm 2.1.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-04-21 13:58+0000\n"
-"Last-Translator: Bruno Emanuel Silva <bemanuel.pe@gmail.com>, 2020\n"
+"Last-Translator: Luiz Henrique Vasconcelos <luizvasconceloss@yahoo.com.br>, 20"
+"20\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/foreman/teams/11"
 "4/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +30,7 @@ msgid "%{vm_size} VM Size"
 msgstr ""
 
 msgid "Action with sub plans"
-msgstr ""
+msgstr "Ação com subplanos"
 
 msgid "Actions"
 msgstr "Ações"
@@ -82,13 +84,13 @@ msgid "Image"
 msgstr "Imagem"
 
 msgid "Import Puppet classes"
-msgstr ""
+msgstr "Importar classes de Puppet"
 
 msgid "Import facts"
-msgstr ""
+msgstr "Importar fatos"
 
 msgid "Load Regions"
-msgstr ""
+msgstr "Carregar regiões"
 
 msgid "Marketplace Image URN"
 msgstr ""
@@ -136,7 +138,7 @@ msgid "Reload Images, Sizes, vNets"
 msgstr ""
 
 msgid "Remote action:"
-msgstr ""
+msgstr "Ação remota:"
 
 msgid "Resource Group"
 msgstr ""

data/locale/ru/foreman_azure_rm.po

@@ -4,17 +4,19 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 # Translators:
-# 0868a4d1af5275b3f70b0a6dac4c99a4, 2020
 # Andrei Burd <burdandrei@gmail.com>, 2020
-# Bryan Kearney <bryan.kearney@gmail.com>, 2020
 # Vladimir Pavlov <v.pavlov@i-teco.ru>, 2020
+# Yulia <yulia.poyarkova@redhat.com>, 2020
+# 0868a4d1af5275b3f70b0a6dac4c99a4, 2020
+# Bryan Kearney <bryan.kearney@gmail.com>, 2020
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.0.8\n"
+"Project-Id-Version: foreman_azure_rm 2.1.1\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2020-04-21 13:58+0000\n"
-"Last-Translator: Vladimir Pavlov <v.pavlov@i-teco.ru>, 2020\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2020\n"
 "Language-Team: Russian (https://www.transifex.com/foreman/teams/114/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +30,7 @@ msgid "%{vm_size} VM Size"
 msgstr ""
 
 msgid "Action with sub plans"
-msgstr ""
+msgstr "Действия с подпланами"
 
 msgid "Actions"
 msgstr "Действия"
@@ -82,13 +84,13 @@ msgid "Image"
 msgstr "Образ"
 
 msgid "Import Puppet classes"
-msgstr ""
+msgstr "Импорт классов Puppet"
 
 msgid "Import facts"
-msgstr ""
+msgstr "Импорт фактов"
 
 msgid "Load Regions"
-msgstr ""
+msgstr "Загрузить регионы"
 
 msgid "Marketplace Image URN"
 msgstr ""
@@ -136,7 +138,7 @@ msgid "Reload Images, Sizes, vNets"
 msgstr ""
 
 msgid "Remote action:"
-msgstr ""
+msgstr "Удаленное действие:"
 
 msgid "Resource Group"
 msgstr ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure_rm
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -10,92 +10,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: deface
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.6
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.6
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.26.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.26.1
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.10
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.10
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_compute
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.7
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.7
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_subscriptions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.18.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.18.5
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Azure Resource Manager as a compute resource for The Foreman