foreman_ansible 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa5982c235f7ca52e9976e1bf0f67dffb08b844421f11caad977e15afabcba7d
-  data.tar.gz: 1ff9a41c74857925e1fc9c4e01cbf85b799e95bc7b9bccec42d2c4cf25ed1fc8
+  metadata.gz: 5f0adadc325dd31954f306695e4f6be32b13d6388db0893cfc2685a2bbb53df3
+  data.tar.gz: 7a3e2bf970e9ebff66219696b5bc4714853b109344d943e8d89d02f45b4b50c0
 SHA512:
-  metadata.gz: 5aa852e92c33636b1abc32204f843d21a8c93b735bf364f6bcdd1276356b51a08b21fdfa0b6936ba346dfa8b46146b454da32836de9cb4b4aa7f87d50c99e88c
-  data.tar.gz: 15c54c485deaad7abfc669f89463a2782d5de89e2d175aab4171d59ea91746c1928265c04c8ec64047014b529e2d3ed38f2fe625e6f5a2dc43b5b0db9060edfa
+  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/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.1'
+  VERSION = '6.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible_core
@@ -333,7 +333,7 @@ homepage: https://github.com/theforeman/foreman_ansible
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -349,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files: