foreman_azure_rm 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04afcc03f8710a4e02d4f540342ff9e1ec9188fc8c83734065eecc6956327341
-  data.tar.gz: 20b3d6cbfd6346270fb9fe335ae0ebde9181751ffd61b6c4bb98868cacf82ab4
+  metadata.gz: 56702d3d39f9bc9753e04e4681b4607d073cc913c1625835dda252a8a575cb6a
+  data.tar.gz: 59999cc6458945958f13933a0a9c1b08b63d8ddad0cb6ece337b86e367948190
 SHA512:
-  metadata.gz: c6dc0580218a0bb8e37c734a669931d1fd6c02d37170b77d50a11afdaaee0c7675ee0cb3897eb8c05aa7e8d58af519a8e1b3e09521b6e1344a78cda1f5e3f456
-  data.tar.gz: 2aea8c30cc2c29bea406c17471bffbf029311616137e964564e236d1b8caee737f8afc644c5b6e52969f4a0eaff59d420bf4a0de7159229b424475e5797da6ba
+  metadata.gz: beb3b60d5c7790ff3063c67634d749fa5ca13148bde4197e40f0d5014ec3bdab94956688b5a6de21fa13ee40e0edf76bccd7ce2fa6e1ebcd6be7fafb9f79057a
+  data.tar.gz: c4e0e9857dfe71bc31d09275c012ed263dde09e25d98ea5d32c75a8be812f8a325a0d5f2e9880f6a84109c9f8a6f2ff3ee5db0e1079b969c27102cd84fc2d54e

data/README.md

@@ -4,7 +4,6 @@
 ```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
@@ -13,25 +12,25 @@
 
 Add the following to bundler.d/Gemfile.local.rb in your Foreman installation directory (/usr/share/foreman by default)
 
-```console
+```bash
 $ gem 'foreman_azure_rm'
 ```
 
 Or simply:
 
-```console
+```bash
 $ 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
 ```
 
@@ -45,7 +44,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
@@ -55,14 +54,10 @@ 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
@@ -76,18 +71,21 @@ 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/vsamP4G.png)
+![](https://i.imgur.com/4ClZhTP.png)
 
 
-![](https://i.imgur.com/Ag9tH55.png)
+![](https://i.imgur.com/eFHucdb.png)
 
 
-![](https://i.imgur.com/fNjlFci.png)
+![](https://i.imgur.com/YjlRQIE.png)
 
     
 ## Planned Features
-* Azure Gov Cloud Support
-* Support for http_proxy
+* Multiple NICs support
+* Support to add multiple data disks (standard or premium)
+* Provision using custom images
+* Provision using shared image galleries
+* 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.

data/app/helpers/azure_compute_resource_helper.rb

@@ -10,4 +10,8 @@ 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
+    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

@@ -59,21 +59,6 @@ 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
@@ -224,7 +209,6 @@ 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])

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

@@ -1,6 +1,7 @@
-<%= text_f f, :app_ident, :label => _('Client ID'), :required => true %>
+<%= 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') %>
 <%= 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 %>
 
-<%= regions_list(@compute_resource, f) %>
+<%= regions_list(@compute_resource, f) %>

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

@@ -1,14 +1,14 @@
-<thead>
-  <tr>
-    <th><%= _('Name') %></th>
-    <th><%= _('Size') %></th>
-    <th><%= _('Resource Group') %></th>
-    <th><%= _('Region') %></th>
-    <th><%= _('State') %></th>
-    <th><%= _('Actions') %></th>
-  </tr>
-</thead>
-<tbody>
+<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>
   <% @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 %>
-</tbody>
+</table>

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, 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?") %>
+<%= 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?") %>

data/lib/foreman_azure_rm/engine.rb

@@ -42,7 +42,7 @@ module ForemanAzureRm
       require 'azure_mgmt_subscriptions'
 
       # Add format validation for azure images
-      ::Image.validates :uuid, uniqueness: { scope: :compute_resource_id, case_sensitive: false }, format: { with: /\A((marketplace|custom|gallery):\/\/)[^:]+(:[^:]+:[^:]+:[^:]+)?\z/,
+      ::Image.validates :uuid, 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.2'.freeze
+  VERSION = '2.1.3'.freeze
 end

data/locale/ko/foreman_azure_rm.po

@@ -7,10 +7,9 @@
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2020
 # Bryan Kearney <bryan.kearney@gmail.com>, 2020
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.1.1\n"
+"Project-Id-Version: foreman_azure_rm 2.0.8\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"
@@ -25,7 +24,7 @@ msgid "%{vm_size} VM Size"
 msgstr ""
 
 msgid "Action with sub plans"
-msgstr "하위 계획이 있는 작업"
+msgstr ""
 
 msgid "Actions"
 msgstr "동작 "
@@ -79,13 +78,13 @@ msgid "Image"
 msgstr "이미지 "
 
 msgid "Import Puppet classes"
-msgstr "Puppet 클래스 가져오기"
+msgstr ""
 
 msgid "Import facts"
-msgstr "팩트 불러오기"
+msgstr ""
 
 msgid "Load Regions"
-msgstr "지역 로드 "
+msgstr ""
 
 msgid "Marketplace Image URN"
 msgstr ""
@@ -133,7 +132,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,10 +7,9 @@
 # Maxim Burgerhout <maxim@wzzrd.com>, 2020
 # EmielK <emiel@kremers.us>, 2020
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.1.1\n"
+"Project-Id-Version: foreman_azure_rm 2.0.8\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,10 +7,9 @@
 # sziolkow <sziolkow@gmail.com>, 2020
 # Michał Foryt <michal.foryt@gmail.com>, 2020
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.1.1\n"
+"Project-Id-Version: foreman_azure_rm 2.0.8\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"
@@ -87,7 +86,7 @@ msgid "Import facts"
 msgstr ""
 
 msgid "Load Regions"
-msgstr "Załaduj regiony"
+msgstr ""
 
 msgid "Marketplace Image URN"
 msgstr ""

data/locale/pt_BR/foreman_azure_rm.po

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

data/locale/ru/foreman_azure_rm.po

@@ -4,19 +4,17 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 # Translators:
-# Andrei Burd <burdandrei@gmail.com>, 2020
-# Vladimir Pavlov <v.pavlov@i-teco.ru>, 2020
-# Yulia <yulia.poyarkova@redhat.com>, 2020
 # 0868a4d1af5275b3f70b0a6dac4c99a4, 2020
+# Andrei Burd <burdandrei@gmail.com>, 2020
 # Bryan Kearney <bryan.kearney@gmail.com>, 2020
+# Vladimir Pavlov <v.pavlov@i-teco.ru>, 2020
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_azure_rm 2.1.1\n"
+"Project-Id-Version: foreman_azure_rm 2.0.8\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"
+"Last-Translator: Vladimir Pavlov <v.pavlov@i-teco.ru>, 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"
@@ -30,7 +28,7 @@ msgid "%{vm_size} VM Size"
 msgstr ""
 
 msgid "Action with sub plans"
-msgstr "Действия с подпланами"
+msgstr ""
 
 msgid "Actions"
 msgstr "Действия"
@@ -84,13 +82,13 @@ msgid "Image"
 msgstr "Образ"
 
 msgid "Import Puppet classes"
-msgstr "Импорт классов Puppet"
+msgstr ""
 
 msgid "Import facts"
-msgstr "Импорт фактов"
+msgstr ""
 
 msgid "Load Regions"
-msgstr "Загрузить регионы"
+msgstr ""
 
 msgid "Marketplace Image URN"
 msgstr ""
@@ -138,7 +136,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.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -230,8 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Azure Resource Manager as a compute resource for The Foreman