foreman_azure 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2eb742a3fe12f6b8d5dc15b70e8bf013882043eb
-  data.tar.gz: 898eaf3509f80f66122a4cd858d5d6d4d1c4ec7f
+  metadata.gz: 2ea76c38a3b8a43fb02dc75f6151da9c33a9e44a
+  data.tar.gz: d36db15142dd1e3f71ec94731c83fbc157a47dce
 SHA512:
-  metadata.gz: e8462d89f84a66de679117da52a237e307e4a45d6bdbbb6c65799e4e39d448990c454117eed1bb7e622ff7facb25a99cba17c128fab221b98ad5c11f0558c4de
-  data.tar.gz: f68f09e9099f31a8d8f29a6dcd5d506cd9d079a6fb9af02b20bc825e4e860afefbdf4d38837d0d639ede4f6283d0b5f7f5b941687ab0dc6ca72952db7f89fdef
+  metadata.gz: 50deb54b6d1dc4358d8f355555b53f31201d4402e0ec21e770ed66a20b1272c5cffb628b3f227a28d283f28b09e835255d0b8dc27f52f900927645f05a55591a
+  data.tar.gz: 9c1f72740bbe9a7aca370a97d393cc05d6e61e658b9422fd778809032e907c038f248996d67623bc6ef9322c569404a45ee3281391e92536459d7cf6f0378e13

data/app/assets/javascripts/foreman_azure/host_os_azure_selected.js

@@ -1,6 +1,6 @@
 function azure_image_selected() {
-  var url = $('#host_compute_attributes_image').attr('data-url');
-  var imageId = $('#host_compute_attributes_image').val();
+  var url = $('#host_compute_attributes_image_id').attr('data-url');
+  var imageId = $('#host_compute_attributes_image_id').val();
   var azure_locations = $('#azure_locations');
   var locations_spinner = $('#azure_locations_spinner');
   tfm.tools.showSpinner();
@@ -10,7 +10,7 @@ function azure_image_selected() {
     type:'get',
     url: url,
     complete: function(){
-      reloadOnAjaxComplete('#host_compute_attributes_image');
+      reloadOnAjaxComplete('#host_compute_attributes_image_id');
       locations_spinner.addClass('hide');
       tfm.tools.hideSpinner();
     },

data/app/controllers/foreman_azure/concerns/hosts_controller_extensions.rb

@@ -2,7 +2,7 @@ module ForemanAzure
   module Concerns
     module HostsControllerExtensions
       def locations
-        if (azure_resource = Image.find_by_uuid(params[:image_id])).present?
+        if (azure_resource = Image.unscoped.find_by_uuid(params[:image_id])).present?
           render :json => azure_resource.compute_resource.
             image_locations(params[:image_id])
         else

data/app/helpers/azure_images_helper.rb

@@ -2,7 +2,7 @@ module AzureImagesHelper
   def select_azure_image(f, images)
     select_f(
       f,
-      :image,
+      :image_id,
       images,
       :uuid,
       :name,

data/app/models/concerns/fog_extensions/azure/server.rb

@@ -3,6 +3,8 @@ module FogExtensions
     module Server
       extend ActiveSupport::Concern
 
+      attr_accessor :image_id
+
       def to_s
         "#{vm_name}@#{cloud_service_name}"
       end

data/app/models/concerns/fog_extensions/azure/servers.rb

@@ -3,16 +3,29 @@ module FogExtensions
     module Servers
       extend ActiveSupport::Concern
 
-      # Azure servers.all doesn't take any argument, against the fog
-      # standard, so we override the method.
-      # https://github.com/fog/fog-azure/pull/25
       included do
         alias_method_chain :all, :patched_arguments
+        alias_method_chain :get, :cloud_service_patch
       end
 
+      # Azure servers.all doesn't take any argument, against the fog
+      # standard, so we override the method.
+      # https://github.com/fog/fog-azure/pull/25
       def all_with_patched_arguments(_options = {})
         all_without_patched_arguments
       end
+
+      # Azure servers.get takes 2 arguments, the cloud service name and
+      # the vm_name. This is against the fog standard, however it's not
+      # possible to uniquely find a VM with just one argument. Instead,
+      # we try our best (see models/foreman_azure/azure.rb#find_vm_by_uuid
+      # for a similar method) to find it.
+      def get_with_cloud_service_patch(identity, cloud_service_name = nil)
+        cloud_service_name ||= identity
+        cloud_service_vm = get_without_cloud_service_patch(identity, cloud_service_name)
+        return cloud_service_vm if cloud_service_vm.present?
+        find { |vm| vm.vm_name == identity }
+      end
     end
   end
 end

data/app/models/foreman_azure/azure.rb

@@ -32,15 +32,21 @@ module ForemanAzure
       client.images
     end
 
+    def provided_attributes
+      super.merge(:ip => :public_ip_address)
+    end
+
     def image_locations(image_id)
       client.images.get(image_id).locations.split(';')
     end
 
     def create_vm(args = {})
+      args.delete_if { |_key, value| value.blank? }
       args[:hostname] = args[:name]
       args[:vm_name] = args[:name].split('.').first
       args[:cloud_service_name] ||= args[:vm_name]
-      args[:vm_user] = Image.find_by_uuid(args[:image]).username
+      args[:image] = args[:image_id]
+      args[:vm_user] = Image.unscoped.find_by_uuid(args[:image_id]).username
       args[:private_key_file] = url
       super(args)
     end

data/app/models/foreman_azure/concerns/ssh_provision_extensions.rb

@@ -0,0 +1,27 @@
+module ForemanAzure
+  module Concerns
+    module SSHProvisionExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method_chain :setSSHWaitForResponse, :use_ssh_keys
+      end
+
+      def setSSHWaitForResponse_with_use_ssh_keys
+        if compute_resource.type == "ForemanAzure::Azure"
+          self.client = Foreman::Provision::SSH.new(
+            provision_ip,
+            image.username,
+            { :template => template_file.path,
+              :uuid => uuid,
+              :keys => [compute_resource.certificate_path] })
+        else
+          setSSHWaitForResponse_without_use_ssh_keys
+        end
+      rescue => e
+        failure _("Failed to login via SSH to %{name}: %{e}") %
+          { :name => name, :e => e }, e
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+<% title @vm.name %>
+<div class='col-md-12'>
+  <table class="<%= table_css_classes %>">
+    <thead>
+      <tr><th colspan="2"><%=_('Properties') %></th></tr>
+    </thead>
+    <tbody>
+      <%= prop :vm_name %>
+      <%= prop :ipaddress %>
+      <%= prop :deployment_status, _('Deployment status') %>
+      <%= prop :status %>
+      <%= prop :cloud_service_name, _('Cloud service name') %>
+      <%= prop :disk_name, _('Disk name') %>
+      <%= prop :image %>
+      <%= prop :vm_user %>
+      <%= prop :vm_size %>
+      <%= prop :storage_account_name, _('Storage account name') %>
+    </tbody>
+  </table>
+</div>

data/lib/foreman_azure/engine.rb

@@ -48,6 +48,8 @@ module ForemanAzure
 
       ::HostsController.send :include,
         ForemanAzure::Concerns::HostsControllerExtensions
+      ::Host::Managed.send :include,
+        ForemanAzure::Concerns::SSHProvisionExtensions
     end
   end
 end

data/lib/foreman_azure/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzure
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-azure
@@ -70,11 +70,13 @@ files:
 - app/models/concerns/fog_extensions/azure/server.rb
 - app/models/concerns/fog_extensions/azure/servers.rb
 - app/models/foreman_azure/azure.rb
+- app/models/foreman_azure/concerns/ssh_provision_extensions.rb
 - app/overrides/add_image_location_js.rb
 - app/views/compute_resources/form/_azure.html.erb
 - app/views/compute_resources/show/_azure.html.erb
 - app/views/compute_resources_vms/form/azure/_base.html.erb
 - app/views/compute_resources_vms/index/_azure.html.erb
+- app/views/compute_resources_vms/show/_azure.html.erb
 - app/views/images/form/_azure.html.erb
 - config/routes.rb
 - lib/foreman_azure.rb