foreman_ansible 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf20c117b247b7bac631b02cdf847af6e29a5eb6
-  data.tar.gz: cfc11ffafe093538f48322fbd581110e34be83a4
+  metadata.gz: 6ade1f70967edc1792c611054dfb7cda66cc68f3
+  data.tar.gz: af7d9bf908aa6ee56899d7840d16fa1d04bed82a
 SHA512:
-  metadata.gz: 1948c441fdfe3002aee7e94abf2b0e742d0d1bd24c6a13405c72f347eb1111baf245343cd3ffb1718ae78f535b422b228964981b0b8cff2a0425c917b238f7b4
-  data.tar.gz: a804813c0baceb26837bb63f25d24bd57d912a74184a143ddb08127afbbc8f831c41f89dfd3f0438a8534e6b32ff3da697c213748f9d83d2bc699dc4a94fa451
+  metadata.gz: 96a268265d406b5576b928f339684f0cff15f440d21ff8ea1fa9d0bae68fafb76624e313908568a653ebf85f56f38971d1b4b7226b817ca6e97d0dfdefd0f31d
+  data.tar.gz: 9d27e74f738166ce43b531ac69e7429c2725d9070cb6f302b557961ae05f3070766129f0ce24efa4aeff5ca810f5bc80f6d850d3680a505559dc1d459e027c29

data/app/helpers/foreman_ansible/hosts_helper_extensions.rb

@@ -6,7 +6,8 @@ module ForemanAnsible
     module Overrides
       def host_title_actions(*args)
         host = args.first
-        if ansible_roles_present?(host)
+        if ansible_roles_present?(host) &&
+           User.current.can?(:create_job_invocations)
           button = ansible_roles_button(host)
           title_actions(button_group(button))
         end
@@ -14,10 +15,14 @@ module ForemanAnsible
       end
 
       def multiple_actions
-        super +
-          [[_('Play Ansible roles'),
-            multiple_play_roles_hosts_path,
-            false]]
+        actions = super
+        if User.current.can?(:create_job_invocations) &&
+           User.current.can?(:play_roles_on_host)
+          actions += [[_('Play Ansible roles'),
+                       multiple_play_roles_hosts_path,
+                       false]]
+        end
+        actions
       end
     end
 
@@ -31,9 +36,9 @@ module ForemanAnsible
     end
 
     def ansible_roles_button(host)
-      link_to(
+      display_link_if_authorized(
         _('Run Ansible roles'),
-        play_roles_host_path(:id => host.id),
+        hash_for_play_roles_host_path(:id => host.id),
         :id => :ansible_roles_button,
         :class => 'btn btn-default',
         :'data-no-turbolink' => true

data/app/models/concerns/foreman_ansible/host_managed_extensions.rb

@@ -1,3 +1,4 @@
+require 'ipaddress'
 module ForemanAnsible
   # Relations to make Host::Managed 'have' ansible roles
   module HostManagedExtensions
@@ -44,6 +45,16 @@ module ForemanAnsible
       # rubocop:enable Metrics/AbcSize
     end
     # rubocop:enable Metrics/BlockLength
+    # Class methods we may need to override or add
+    module ClassMethods
+      def import_host(hostname, certname = nil, deprecated_proxy = nil)
+        host = super(hostname, certname, deprecated_proxy)
+        if IPAddress.valid?(hostname) && Nic::Interface.find_by(:ip => hostname)
+          host = Nic::Interface.find_by(:ip => hostname).host
+        end
+        host
+      end
+    end
   end
 end
 

data/app/models/foreman_ansible/ansible_provider.rb

@@ -27,6 +27,10 @@ if defined? ForemanRemoteExecution
           )
         end
 
+        def supports_effective_user?
+          true
+        end
+
         private
 
         def ansible_command?(template)

data/app/services/foreman_ansible/ansible_report_importer.rb

@@ -0,0 +1,19 @@
+require 'ipaddress'
+module ForemanAnsible
+  # Ensures Ansible reports from hosts where the IP was used, are assigned
+  # to the right hostname in Foreman
+  module AnsibleReportImporter
+    extend ActiveSupport::Concern
+    included do
+      def host
+        hostname = name.downcase
+        if AnsibleReportScanner.ansible_report?(raw['logs']) &&
+           IPAddress.valid?(hostname) &&
+           Nic::Interface.find_by(:ip => hostname)
+          @host = Nic::Interface.find_by(:ip => hostname).host
+        end
+        super
+      end
+    end
+  end
+end

data/app/services/foreman_ansible/ansible_report_scanner.rb

@@ -11,6 +11,7 @@ module ForemanAnsible
       end
 
       def ansible_report?(logs)
+        return false if logs.blank?
         logs.any? do |log|
           log['log'].fetch('messages', {}).
             fetch('message', '') =~ /"_ansible_parsed"/

data/app/services/foreman_ansible/inventory_creator.rb

@@ -91,12 +91,13 @@ module ForemanAnsible
 
     def remote_execution_options(host)
       params = {
-        'ansible_become' => @template_invocation.effective_user,
+        'ansible_become_user' => @template_invocation.effective_user,
         'ansible_user' => host_setting(host, 'remote_execution_ssh_user'),
         'ansible_ssh_pass' => rex_ssh_password(host),
         'ansible_ssh_private_key_file' => ansible_or_rex_ssh_private_key(host),
         'ansible_port' => host_setting(host, 'remote_execution_ssh_port')
       }
+      params['ansible_become'] = true if params['ansible_become_user'].present?
       # Backward compatibility for Ansible 1.x
       params['ansible_ssh_port'] = params['ansible_port']
       params['ansible_ssh_user'] = params['ansible_user']

data/app/views/foreman_ansible/ansible_roles/_hostgroup_ansible_roles_button.erb

@@ -5,9 +5,12 @@
     display_link_if_authorized(_('Play Roles'),   hash_for_play_roles_hostgroup_path(:id => hostgroup),   :'data-no-turbolink' => true)
   end
 
-  action_buttons(
-              display_link_if_authorized(_('Nest'),    hash_for_nest_hostgroup_path(:id => hostgroup)),
-              display_link_if_authorized(_('Clone'),   hash_for_clone_hostgroup_path(:id => hostgroup)),
-              play_roles,
-              display_delete_if_authorized(hash_for_hostgroup_path(:id => hostgroup).merge(:auth_object => hostgroup, :authorizer => authorizer), :data => { :confirm => warning_message(hostgroup) }))
+  actions = [
+    display_link_if_authorized(_('Nest'),    hash_for_nest_hostgroup_path(:id => hostgroup)),
+    display_link_if_authorized(_('Clone'),   hash_for_clone_hostgroup_path(:id => hostgroup))
+  ]
+  actions.push play_roles if User.current.can?(:create_job_invocations)
+  actions.push display_delete_if_authorized(hash_for_hostgroup_path(:id => hostgroup).merge(:auth_object => hostgroup, :authorizer => authorizer), :data => { :confirm => warning_message(hostgroup) })
+
+  action_buttons(*actions)
 %>

data/app/views/foreman_ansible/job_templates/power_action_-_ansible_default.erb

@@ -19,7 +19,6 @@ model: JobTemplate
 - hosts: all
   tasks:
     - command: |
-        echo <%= input('action') %> host && sleep 3
         <%= case input('action')
           when 'restart'
             'shutdown -r +1'

data/lib/foreman_ansible/engine.rb

@@ -104,6 +104,9 @@ module ForemanAnsible
         ::Api::V2::HostgroupsController.send(
           :include, ForemanAnsible::Api::V2::HostgroupsParamGroupExtensions
         )
+        ::ConfigReportImporter.send(
+          :include, ForemanAnsible::AnsibleReportImporter
+        )
       rescue StandardError => e
         Rails.logger.warn "Foreman Ansible: skipping engine hook (#{e})"
       end

data/lib/foreman_ansible/version.rb

@@ -2,5 +2,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '2.2.1'.freeze
+  VERSION = '2.2.2'.freeze
 end

data/test/unit/concerns/host_managed_extensions_test.rb

@@ -34,4 +34,15 @@ class HostManagedExtensionsTest < ActiveSupport::TestCase
       @host.inherited_ansible_roles.must_equal [@role2]
     end
   end
+
+  describe 'import facts' do
+    test 'when hostname looks like an IP it finds the right host' do
+      @host = ::FactoryBot.create(:host, :ip => '192.168.128.27')
+      assert_equal @host, Host::Managed.import_host(@host.ip)
+    end
+
+    test 'when hostname looks like an IP but there is no host with that IP' do
+      assert Host::Managed.import_host('192.168.128.27').new_record?
+    end
+  end
 end

data/test/unit/services/ansible_report_importer_test.rb

@@ -0,0 +1,21 @@
+require 'test_plugin_helper'
+# Unit tests for AnsibleReportImporter
+# This class is just meant to capture the config reports coming
+# from Ansible and change anything that is required
+class AnsibleReportImporterTest < ActiveSupport::TestCase
+  setup do
+    @raw = { 'host' => '192.168.121.1' }
+    @importer = ::ConfigReportImporter.new(@raw)
+  end
+
+  test 'finds host when the hostname is given as the IP' do
+    host = ::FactoryBot.create(:host, :ip => @raw['host'])
+    ForemanAnsible::AnsibleReportScanner.expects(:ansible_report?).returns(true)
+    assert_equal @importer.host, host
+  end
+
+  test 'creates new host if IP is not found' do
+    ForemanAnsible::AnsibleReportScanner.expects(:ansible_report?).returns(true)
+    assert @importer.host.new_record?
+  end
+end

data/test/unit/services/inventory_creator_test.rb

@@ -52,8 +52,9 @@ module ForemanAnsible
                                                        @template_invocation)
       connection_params = inventory.connection_params(@host)
       assert_empty extra_options.to_a - inventory.connection_params(@host).to_a
+      assert_equal true, connection_params['ansible_become']
       assert_equal @template_invocation.effective_user,
-                   connection_params['ansible_become']
+                   connection_params['ansible_become_user']
       assert_equal Setting['ansible_connection'],
                    connection_params['ansible_connection']
       refute_equal Setting['remote_execution_ssh_user'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -127,6 +127,7 @@ files:
 - app/overrides/hostgroup_ansible_roles_tab.rb
 - app/overrides/hostgroup_play_roles.rb
 - app/overrides/report_output.rb
+- app/services/foreman_ansible/ansible_report_importer.rb
 - app/services/foreman_ansible/ansible_report_scanner.rb
 - app/services/foreman_ansible/api_roles_importer.rb
 - app/services/foreman_ansible/fact_importer.rb
@@ -213,6 +214,7 @@ files:
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
 - test/unit/lib/foreman_ansible_core/roles_reader_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/services/ansible_report_importer_test.rb
 - test/unit/services/api_roles_importer_test.rb
 - test/unit/services/fact_importer_test.rb
 - test/unit/services/fact_parser_test.rb
@@ -270,6 +272,7 @@ test_files:
 - test/unit/services/api_roles_importer_test.rb
 - test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/fact_sparser_test.rb
+- test/unit/services/ansible_report_importer_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
 - test/unit/actions/run_ansible_job_test.rb
 - test/test_plugin_helper.rb