foreman_azure_rm 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cca0d2f188d4731dbf29f7875aad1000fc3f176306dda4083caf2d053093f55f
-  data.tar.gz: d316ee9bb58752babbeb553ab24b9d1e62e496b1596dc0477b7ed839f45d3fc1
+  metadata.gz: cc75ad1df578bcc16ca37a67e323b1ff763ec6e6149db99a1056ae88c9248c5d
+  data.tar.gz: 3d8127cce9836f8f23c95947e5497b2c8f3c4d3fc10a7ad025c0d09fa805a06a
 SHA512:
-  metadata.gz: 9cef189f01b675262daed8b5a42b9a2324ad0952cda775a6484b3d45c45ff89b0742558c4a6f5d166a52bb3d5b749870a40d65d1a8e92de709e9615e2eb693de
-  data.tar.gz: b7c2a5d6fc6e5bb6b0127eb0a52a307e93abb7fafbd419d09064e8fe15e3c0d7b4e9e4c14fd7c83feff5b55687021084a25d4a6ee74bc581885aa4266ba645fe
+  metadata.gz: a213f22eb2b08b07fe28b803a33136a4d3a977eb46a4b95bf926f48189137efef13aacf37a4d81cf2f47c6d710e5ac8a73d5f498431d7a06d3bf6e4d7567380f
+  data.tar.gz: c361b566af6b568899c60942826a6db92e973da00ac4d6a8641a2c3592090ceaf87fe6a57414b3f260f486b70ebc84c98966da1802477987f816baa19c99a4c1

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,10 +55,14 @@ 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
@@ -71,21 +76,18 @@ 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    
+* Azure Gov Cloud 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.

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

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

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/engine.rb

@@ -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.0'.freeze
+  VERSION = '2.1.1'.freeze
 end

data/locale/action_names.rb

@@ -0,0 +1,5 @@
+# Autogenerated!
+_("Action with sub plans")
+_("Import facts")
+_("Import Puppet classes")
+_("Remote action:")

data/locale/ca/foreman_azure_rm.po

@@ -0,0 +1,185 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_azure_rm package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# Translators:
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2020
+#
+msgid ""
+msgstr ""
+"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: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2020\n"
+"Language-Team: Catalan (https://www.transifex.com/foreman/teams/114/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "%{vm_size} VM Size"
+msgstr ""
+
+msgid "Action with sub plans"
+msgstr ""
+
+msgid "Actions"
+msgstr "Accions"
+
+msgid "Additional number of disks can be added based on VM Size. For more details, please refer to Microsoft Azure's documentation"
+msgstr ""
+
+msgid "Azure Region"
+msgstr ""
+
+msgid "Azure Resource Manager as a compute resource for Foreman"
+msgstr ""
+
+msgid "Azure Subnet"
+msgstr ""
+
+msgid "Azure's Default"
+msgstr ""
+
+msgid "Azure's default"
+msgstr ""
+
+msgid "Client ID"
+msgstr ""
+
+msgid "Client ID for AzureRm"
+msgstr ""
+
+msgid "Client Secret"
+msgstr ""
+
+msgid "Client Secret for AzureRm"
+msgstr ""
+
+msgid "Comma seperated file URIs"
+msgstr ""
+
+msgid "Custom Script Command"
+msgstr ""
+
+msgid "Data Disk Caching"
+msgstr ""
+
+msgid "Default ReadWrite"
+msgstr ""
+
+msgid "Does this image support user data input?"
+msgstr "La imatge admet l'entrada de dades d'usuari?"
+
+msgid "Image"
+msgstr "Imatge"
+
+msgid "Import Puppet classes"
+msgstr ""
+
+msgid "Import facts"
+msgstr ""
+
+msgid "Load Regions"
+msgstr ""
+
+msgid "Marketplace Image URN"
+msgstr ""
+
+msgid "Marketplace URN (e.g. OpenLogic:CentOS:7.5:latest)"
+msgstr ""
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "OS Disk Caching"
+msgstr ""
+
+msgid "Password"
+msgstr "Contrasenya"
+
+msgid "Password to authenticate with - used for SSH finish step."
+msgstr ""
+
+msgid "Platform"
+msgstr ""
+
+msgid "Please select a Resource Group"
+msgstr ""
+
+msgid "Please select a VM Size"
+msgstr ""
+
+msgid "Please select an image"
+msgstr "Si us plau, seleccioneu una imatge"
+
+msgid "Premium OS Disk"
+msgstr ""
+
+msgid "Properties"
+msgstr "Propietats"
+
+msgid "Public IP"
+msgstr ""
+
+msgid "Region"
+msgstr "Regió"
+
+msgid "Reload Images, Sizes, vNets"
+msgstr ""
+
+msgid "Remote action:"
+msgstr ""
+
+msgid "Resource Group"
+msgstr ""
+
+msgid "SSH Key"
+msgstr ""
+
+msgid "Select"
+msgstr "Selecciona"
+
+msgid "Size"
+msgstr "Mida"
+
+msgid "Size (GB)"
+msgstr "Mida (GB)"
+
+msgid "State"
+msgstr "Estat"
+
+msgid "Static Private IP"
+msgstr ""
+
+msgid "Subscription ID"
+msgstr "ID de subscripció"
+
+msgid "Subscription ID for AzureRm"
+msgstr ""
+
+msgid "Tenant ID"
+msgstr ""
+
+msgid "The region you selected has no sizes associated with it"
+msgstr ""
+
+msgid "The selected image has no associated compute resource"
+msgstr ""
+
+msgid "The selected region has no subnets"
+msgstr ""
+
+msgid "The user that will be used to SSH into the VM for completion"
+msgstr ""
+
+msgid "To perform commands as root, prefix it with 'sudo'"
+msgstr ""
+
+msgid "Username"
+msgstr "Nom d'usuari"
+
+msgid "VM Size"
+msgstr ""

data/locale/cs_CZ/foreman_azure_rm.po

@@ -0,0 +1,189 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_azure_rm package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+# Translators:
+# Lukáš Zapletal, 2020
+# Pavel Borecki <pavel.borecki@gmail.com>, 2020
+# mhulan <mhulan@redhat.com>, 2020
+#
+msgid ""
+msgstr ""
+"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: mhulan <mhulan@redhat.com>, 2020\n"
+"Language-Team: Czech (Czech Republic) (https://www.transifex.com/foreman/teams"
+"/114/cs_CZ/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs_CZ\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= "
+"4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+msgid "%{vm_size} VM Size"
+msgstr ""
+
+msgid "Action with sub plans"
+msgstr ""
+
+msgid "Actions"
+msgstr "Akce"
+
+msgid "Additional number of disks can be added based on VM Size. For more details, please refer to Microsoft Azure's documentation"
+msgstr ""
+
+msgid "Azure Region"
+msgstr ""
+
+msgid "Azure Resource Manager as a compute resource for Foreman"
+msgstr ""
+
+msgid "Azure Subnet"
+msgstr ""
+
+msgid "Azure's Default"
+msgstr ""
+
+msgid "Azure's default"
+msgstr ""
+
+msgid "Client ID"
+msgstr ""
+
+msgid "Client ID for AzureRm"
+msgstr ""
+
+msgid "Client Secret"
+msgstr ""
+
+msgid "Client Secret for AzureRm"
+msgstr ""
+
+msgid "Comma seperated file URIs"
+msgstr ""
+
+msgid "Custom Script Command"
+msgstr ""
+
+msgid "Data Disk Caching"
+msgstr ""
+
+msgid "Default ReadWrite"
+msgstr ""
+
+msgid "Does this image support user data input?"
+msgstr "Podporuje tento obraz vstup dat od uživatele?"
+
+msgid "Image"
+msgstr "Obraz"
+
+msgid "Import Puppet classes"
+msgstr ""
+
+msgid "Import facts"
+msgstr ""
+
+msgid "Load Regions"
+msgstr ""
+
+msgid "Marketplace Image URN"
+msgstr ""
+
+msgid "Marketplace URN (e.g. OpenLogic:CentOS:7.5:latest)"
+msgstr ""
+
+msgid "Name"
+msgstr "Název"
+
+msgid "OS Disk Caching"
+msgstr ""
+
+msgid "Password"
+msgstr "Heslo"
+
+msgid "Password to authenticate with - used for SSH finish step."
+msgstr "Heslo které použít pro ověření se – použito pro krok dokončení po SSH."
+
+msgid "Platform"
+msgstr ""
+
+msgid "Please select a Resource Group"
+msgstr ""
+
+msgid "Please select a VM Size"
+msgstr ""
+
+msgid "Please select an image"
+msgstr "Vyberte obraz"
+
+msgid "Premium OS Disk"
+msgstr ""
+
+msgid "Properties"
+msgstr "Vlastnosti"
+
+msgid "Public IP"
+msgstr ""
+
+msgid "Region"
+msgstr "Oblast"
+
+msgid "Reload Images, Sizes, vNets"
+msgstr ""
+
+msgid "Remote action:"
+msgstr ""
+
+msgid "Resource Group"
+msgstr ""
+
+msgid "SSH Key"
+msgstr ""
+
+msgid "Select"
+msgstr "Vybrat"
+
+msgid "Size"
+msgstr "Velikost"
+
+msgid "Size (GB)"
+msgstr "Velikost (GB)"
+
+msgid "State"
+msgstr "Stav"
+
+msgid "Static Private IP"
+msgstr ""
+
+msgid "Subscription ID"
+msgstr "Identifikátor předplatného"
+
+msgid "Subscription ID for AzureRm"
+msgstr ""
+
+msgid "Tenant ID"
+msgstr ""
+
+msgid "The region you selected has no sizes associated with it"
+msgstr ""
+
+msgid "The selected image has no associated compute resource"
+msgstr ""
+
+msgid "The selected region has no subnets"
+msgstr ""
+
+msgid "The user that will be used to SSH into the VM for completion"
+msgstr ""
+
+msgid "To perform commands as root, prefix it with 'sudo'"
+msgstr ""
+
+msgid "Username"
+msgstr "Uživatelské jméno"
+
+msgid "VM Size"
+msgstr ""