foreman_ansible 6.0.2 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f071261ab8d77b0963a3ee7a82e198139cf095391a9140efb6a7d954778a5fa
-  data.tar.gz: 0355abc8c57df2c8af562546353d76b663d4a4634fb7b16f937a59eb13c3c4e8
+  metadata.gz: 5f0adadc325dd31954f306695e4f6be32b13d6388db0893cfc2685a2bbb53df3
+  data.tar.gz: 7a3e2bf970e9ebff66219696b5bc4714853b109344d943e8d89d02f45b4b50c0
 SHA512:
-  metadata.gz: dfe1e9afb9fb2be9ec55bb2df53c132daa25f8ede8918734bcc6992fc4a75b687bebb32b382abdb5ddb8bd842c890f13e583c932f250e700a2237c1ccf7eda6b
-  data.tar.gz: 2c065cb05f42b4bcf52003a64e8466542ebc6eec5e6fcda5332f8f0f6a0a6f4f9f5c031cda9ae82c306402f6820c15c9a7194d9a2a776aa054276d4dfee2b044
+  metadata.gz: d0ae153aa823b601fccf70886d3e6f036585010467c5df1233bb84c3851ca4fc2b5d83e7f3f4a89c796a38f0e1497c58c550d33777c480b058d5e8eafc9f9195
+  data.tar.gz: 83f7f0c912b9db4dda3a363690aaf49117581680a1638718410efe9f0c937ba9caae35599c04130ddcc10540a586af57215d279f959abda41aec4a4dd814a76b

data/app/controllers/api/v2/ansible_inventories_controller.rb

@@ -72,8 +72,8 @@ module Api
           process_resource_error(:resource => @ansible_inventory)
         end
       rescue StandardError => e
-        render_error 'standard_error', :status => :internal_error,
-                                       :locals => { :exception => e }
+        render_error :custom_error, :status => :unprocessable_entity,
+                                    :locals => { :message => _("Scheduling Report template failed for: #{e.message}") }
       end
 
       def action_permission

data/app/helpers/foreman_ansible/ansible_reports_helper.rb

@@ -68,7 +68,7 @@ module ForemanAnsible
       prettyp.gsub!(/^(\[|\])/, '')
       prettyp.gsub!(/^[\s]*$\n/, '')
       paragraph_style = 'white-space:pre;padding: 2em 0'
-      content_tag(:p, prettyp, :style => paragraph_style)
+      tag(:p, prettyp, :style => paragraph_style)
     end
 
     def hash_with_keys_removed(hash)

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

@@ -68,9 +68,9 @@ end
 module Host
   class Managed
     apipie :class do
-      property :all_ansible_roles, array_of: 'AnsibleRole', desc: 'Returns all ansible roles assigned to the host, both its own and inherited'
-      property :ansible_roles, array_of: 'AnsibleRole', desc: 'Returns ansible roles assigned to the host'
-      property :inherited_ansible_roles, array_of: 'AnsibleRole', desc: 'Returns inherited ansible roles assigned to the host'
+      property :all_ansible_roles, array_of: 'AnsibleRole', desc: 'Returns all ansible roles assigned to the host, both its own and inherited from the host group and its parents'
+      property :ansible_roles, array_of: 'AnsibleRole', desc: 'Returns ansible roles directly assigned to the host'
+      property :inherited_ansible_roles, array_of: 'AnsibleRole', desc: 'Returns only ansible roles assigned to the host\'s host group and its parents'
     end
     # Methods to be allowed in any template with safemode enabled
     class Jail < Safemode::Jail

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

@@ -36,3 +36,15 @@ module ForemanAnsible
     end
   end
 end
+
+class Hostgroup
+  apipie :class do
+    property :all_ansible_roles, array_of: 'AnsibleRole', desc: 'Returns all ansible roles assigned to the host group, both its own and inherited from parent host groups'
+    property :ansible_roles, array_of: 'AnsibleRole', desc: 'Returns ansible roles directly assigned to the host group'
+    property :inherited_ansible_roles, array_of: 'AnsibleRole', desc: 'Returns only the inherited ansible roles assigned to the host group\'s parents'
+  end
+  # Methods to be allowed in any template with safemode enabled
+  class Jail < Safemode::Jail
+    allow :all_ansible_roles, :ansible_roles, :inherited_ansible_roles
+  end
+end

data/app/models/foreman_ansible/ansible_provider.rb

@@ -35,7 +35,7 @@ if defined? ForemanRemoteExecution
           {
             'per-host' => {
               host.name => {
-                'ansible_password' => rex_ssh_password(host),
+                'ansible_ssh_pass' => rex_ssh_password(host),
                 'ansible_become_password' => rex_effective_user_password(host)
               }
             }

data/app/services/foreman_ansible/operating_system_parser.rb

@@ -80,8 +80,14 @@ module ForemanAnsible
         facts[:ansible_os_name].tr(" \n\t", '') ||
           facts[:ansible_distribution].tr(" \n\t", '')
       else
-        facts[:ansible_distribution] ||
-          facts[:ansible_lsb] && facts[:ansible_lsb]['id']
+        distribution = facts[:ansible_distribution] || facts[:ansible_lsb].try(:[], 'id')
+
+        if distribution == 'RedHat' &&
+           facts[:ansible_lsb].try(:[], 'id') == 'RedHatEnterpriseWorkstation'
+          distribution += '_Workstation'
+        end
+
+        distribution
       end
     end
 

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

@@ -34,11 +34,10 @@ feature: ansible_run_capsule_upgrade
         msg: "This playbook cannot be executed on a Satellite server. Use only on a Capsule server."
       when: "'satellite' in ansible_facts.packages"
 
-    - name: Install satellite-maintain if not present
+    - name: Install|Update satellite-maintain if not present
       package:
         name: rubygem-foreman_maintain
-        state: present
-      when: "'rubygem-foreman_maintain' not in ansible_facts.packages"
+        state: latest
 
     - block:
       <%- whitelist_option = if input('whitelist_options').present?

data/lib/foreman_ansible/version.rb

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

data/test/unit/ansible_provider_test.rb

@@ -40,7 +40,7 @@ class AnsibleProviderTest < ActiveSupport::TestCase
         host.expects(:params).twice.returns(params)
         secrets = ForemanAnsible::AnsibleProvider.secrets(host)
         host_secrets = secrets['per-host'][host.name]
-        assert_equal host_secrets['ansible_password'], 'password'
+        assert_equal host_secrets['ansible_ssh_pass'], 'password'
         assert_equal host_secrets['ansible_become_password'], 'letmein'
       end
     end

data/test/unit/lib/foreman_ansible_core/ansible_runner_test.rb

@@ -24,7 +24,7 @@ module ForemanAnsibleCore
             '_meta' => { 'hostvars' => { 'foreman.example.com' => {} } } }
         end
         let(:input) do
-          host_secrets = { 'ansible_password' => 'letmein', 'ansible_become_password' => 'iamroot' }
+          host_secrets = { 'ansible_ssh_pass' => 'letmein', 'ansible_become_password' => 'iamroot' }
           secrets = { 'per-host' => { 'foreman.example.com' => host_secrets } }
           host_input = { 'input' => { 'action_input' => { 'secrets' => secrets } } }
           { 'foreman.example.com' => host_input }
@@ -35,14 +35,14 @@ module ForemanAnsibleCore
           test_inventory = inventory.merge('ssh_password' => 'sshpass', 'effective_user_password' => 'mypass')
           rebuilt = runner.send(:rebuild_secrets, test_inventory, input)
           host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-          assert_equal 'sshpass', host_vars['ansible_password']
+          assert_equal 'sshpass', host_vars['ansible_ssh_pass']
           assert_equal 'mypass', host_vars['ansible_become_password']
         end
 
         test 'host secrets are used when not overriden by inventory secrest' do
           rebuilt = runner.send(:rebuild_secrets, inventory, input)
           host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-          assert_equal 'letmein', host_vars['ansible_password']
+          assert_equal 'letmein', host_vars['ansible_ssh_pass']
           assert_equal 'iamroot', host_vars['ansible_become_password']
         end
       end

data/test/unit/lib/foreman_ansible_core/playbook_runner_test.rb

@@ -87,7 +87,7 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
         '_meta' => { 'hostvars' => { 'foreman.example.com' => {} } } }
     end
     let(:secrets) do
-      host_secrets = { 'ansible_password' => 'letmein', 'ansible_become_password' => 'iamroot' }
+      host_secrets = { 'ansible_ssh_pass' => 'letmein', 'ansible_become_password' => 'iamroot' }
       { 'per-host' => { 'foreman.example.com' => host_secrets } }
     end
     let(:runner) { ForemanAnsibleCore::Runner::Playbook.allocate }
@@ -96,14 +96,14 @@ class PlaybookRunnerTest < ActiveSupport::TestCase
       test_inventory = inventory.merge('ssh_password' => 'sshpass', 'effective_user_password' => 'mypass')
       rebuilt = runner.send(:rebuild_secrets, test_inventory, secrets)
       host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-      assert_equal 'sshpass', host_vars['ansible_password']
+      assert_equal 'sshpass', host_vars['ansible_ssh_pass']
       assert_equal 'mypass', host_vars['ansible_become_password']
     end
 
     test 'host secrets are used when not overriden by inventory secrest' do
       rebuilt = runner.send(:rebuild_secrets, inventory, secrets)
       host_vars = rebuilt.dig('_meta', 'hostvars', 'foreman.example.com')
-      assert_equal 'letmein', host_vars['ansible_password']
+      assert_equal 'letmein', host_vars['ansible_ssh_pass']
       assert_equal 'iamroot', host_vars['ansible_become_password']
     end
   end

data/test/unit/services/inventory_creator_test.rb

@@ -69,7 +69,7 @@ module ForemanAnsible
                    connection_params['ansible_winrm_server_cert_validation']
       assert_equal Setting['remote_execution_effective_user_method'],
                    connection_params['ansible_become_method']
-      refute connection_params.key?('ansible_password')
+      refute connection_params.key?('ansible_ssh_pass')
       refute connection_params.key?('ansible_become_password')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.1.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible_core