foreman_ansible 11.0.0 → 11.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 348701b380a514ccae60dda27305a137438dd4cd2812f9515e071a527a0b20c5
-  data.tar.gz: ab770d603437ed890a945381d28411e0caff547f6bef26b22c98191fe6317b98
+  metadata.gz: d240da772a37f88926b90ead02fae80bea4f14e257cff99873c805c7ff171a92
+  data.tar.gz: 00e38d4208388c1893e29f440f1afc6f4988fc31a9c1d9e1107bb337f34e14a2
 SHA512:
-  metadata.gz: 0a780ccd49ae7534e43de5ea1f50aab631b3f59c30c5793455e242568b77d2572fe187f7f0c75667cb1c22ccfd03666dd2ce7df2541cb974df1693ff58079250
-  data.tar.gz: ab9bdea79a470967e8c6592d7166317668a5d9f892887b8d715fc1daaa9a8ce99959cb5c4da2496dabf4b9e4d2ada5909c2e78bfa250bcd13d2250d7d32a1473
+  metadata.gz: b1af6d0d6eee6c4f7ef48c22d795c6480516c1f8fa80539d64b6c6184b945af1a8a6350cfa963963b486a1b169a907efffa6573528547e1e386d47b819d96967
+  data.tar.gz: 2e8f162c2ec013b1bee7be62f06b77a55b0d22d57e40449e3cdb7312ff3a532fa3bb61a0b083fb7a5421d5ad33a1d7811d749e0ec4c6e95741d36bd49644da46

data/README.md

@@ -6,21 +6,18 @@
 
 Reporting and facts import from Ansible to Foreman.
 
-* Main website: [theforeman.org](http://theforeman.org)
-* Plugin manual: [foreman_ansible manual](http://theforeman.org/plugins/foreman_ansible)
-* ServerFault tag: [Foreman](http://serverfault.com/questions/tagged/foreman)
-* Issues: [foreman ansible on Redmine](http://projects.theforeman.org/projects/ansible/issues)
-* Community and support: [#theforeman](https://kiwiirc.com/client/irc.freenode.net/?#theforeman) for general support, [#theforeman-dev](https://kiwiirc.com/client/irc.freenode.net/?#theforeman-dev) for development chat in [Freenode](irc.freenode.net)
-* Mailing lists:
-    * [foreman-users](https://groups.google.com/forum/?fromgroups#!forum/foreman-users)
-    * [foreman-dev](https://groups.google.com/forum/?fromgroups#!forum/foreman-dev)
+* Main website: [theforeman.org](https://theforeman.org)
+* Plugin manual: [foreman_ansible manual](https://theforeman.org/plugins/foreman_ansible)
+* ServerFault tag: [Foreman](https://serverfault.com/questions/tagged/foreman)
+* Issues: [foreman ansible on Redmine](https://projects.theforeman.org/projects/ansible/issues)
+* Chat and forum: [https://theforeman.org/support.html](https://theforeman.org/support.html)
 
 ## Features
 * Import facts
 * Monitor playbook and Ansible runs runtime
 * Sends Ansible reports to Foreman that contain what changed on your system after an ansible run.
 * Stores a list of roles applicable to your hosts and 'plays' them
-* Looking for an Ansible dynamic inventory for Foreman? Use [foreman_ansible_inventory](https://github.com/theforeman/foreman_ansible_inventory/)
+* Looking for an Ansible dynamic inventory for Foreman? Use [theforeman.foreman.foreman](https://github.com/theforeman/foreman-ansible-modules/blob/develop/plugins/inventory/foreman.py)
 
 ## Documentation (installation and configuration)
 Check out the official manual at [theforeman.org](http://theforeman.org/plugins/foreman_ansible/2.x/index.html)

data/app/graphql/types/overriden_ansible_variable.rb

@@ -8,12 +8,14 @@ module Types
       argument :match, String, required: false
     end
 
-    field :meta, ::Types::Meta, resolve: (proc do |object|
+    field :meta, ::Types::Meta
+
+    def meta
       {
         :can_edit => ::User.current.can?(object.ansible_variable.permission_name(:edit), object.ansible_variable),
         :can_destroy => ::User.current.can?(object.ansible_variable.permission_name(:destroy), object.ansible_variable)
       }
-    end)
+    end
 
     def lookup_values(match: nil)
       return CollectionLoader.for(object.ansible_variable.class, :lookup_values).load(object.ansible_variable) unless match

data/app/helpers/foreman_ansible/ansible_hostgroups_helper.rb

@@ -3,13 +3,19 @@
 module ForemanAnsible
   module AnsibleHostgroupsHelper
     def ansible_hostgroups_actions(hostgroup)
+      actions = []
       play_roles = if hostgroup.all_ansible_roles.empty?
                      { action: { content: (link_to _('Run all Ansible roles'), 'javascript:void(0);', disabled: true, title: 'No roles assigned', class: 'disabled'), options: { class: 'disabled' } }, priority: 31 }
                    else
                      { action: display_link_if_authorized(_('Run all Ansible roles'), hash_for_play_roles_hostgroup_path(id: hostgroup), 'data-no-turbolink': true, title: _('Run all Ansible roles on hosts belonging to this host group')), priority: 31 }
                    end
 
-      [play_roles] if User.current.can?(:create_job_invocations)
+      assign_jobs = { action: { content: (link_to _('Configure Ansible Job'), "/ansible/hostgroups/#{hostgroup.id}", class: 'la') }, priority: 32 }
+
+      actions.push play_roles if User.current.can?(:create_job_invocations)
+      actions.push assign_jobs if User.current.can?(:view_job_invocations) && User.current.can?(:view_recurring_logics)
+
+      actions
     end
   end
 end

data/app/helpers/foreman_ansible/ansible_reports_helper.rb

@@ -28,26 +28,36 @@ module ForemanAnsible
     def ansible_module_message(log)
       msg_json = parsed_message_json(log)
       return _("Execution error: #{msg_json['msg']}") if msg_json['failed'].present?
+      return msg_json['censored'] if msg_json['censored'].present?
 
-      module_action = msg_json['module']
+      module_action = msg_json.fetch('module', '').delete_prefix('ansible.builtin.').delete_prefix('ansible.legacy.')
       case module_action
       when 'package'
         msg_json['results'].empty? ? msg_json['msg'] : msg_json['results']
       when 'template'
-        module_args = msg_json['invocation']['module_args']
-        _("Rendered template #{module_args['_original_basename']} to #{msg_json['dest']}")
+        get_results(msg_json) do |module_args, result|
+          _("Rendered template #{module_args['_original_basename']} to #{result['dest']}")
+        end
       when 'service'
-        _("Service #{msg_json['name']} #{msg_json['state']} (enabled: #{msg_json['enabled']})")
+        get_results(msg_json) do |_, result|
+          _("Service #{result['name']} #{result['state']} (enabled: #{result['enabled']})")
+        end
       when 'group'
-        _("User group #{msg_json['name']} #{msg_json['state']}, gid: #{msg_json['gid']}")
+        get_results(msg_json) do |_, result|
+          _("User group #{result['name']} #{result['state']}, gid: #{result['gid']}")
+        end
       when 'user'
-        _("User #{msg_json['name']} #{msg_json['state']}, uid: #{msg_json['uid']}")
+        get_results(msg_json) do |_, result|
+          _("User #{result['name']} #{result['state']}, uid: #{result['uid']}")
+        end
       when 'cron'
-        module_args = msg_json['invocation']['module_args']
-        _("Cron job: #{module_args['minute']} #{module_args['hour']} #{module_args['day']} #{module_args['month']} #{module_args['weekday']} #{module_args['job']} (disabled: #{module_args['disabled']})")
+        get_results(msg_json) do |module_args, _|
+          _("Cron job: #{module_args['minute']} #{module_args['hour']} #{module_args['day']} #{module_args['month']} #{module_args['weekday']} #{module_args['job']} (disabled: #{module_args['disabled']})")
+        end
       when 'copy'
-        module_args = msg_json['invocation']['module_args']
-        _("Copy #{module_args['_original_basename']} to #{msg_json['dest']}")
+        get_results(msg_json) do |module_args, result|
+          _("Copy #{module_args['_original_basename']} to #{result['dest']}")
+        end
       when 'command', 'shell'
         msg_json['stdout_lines']
       else
@@ -82,6 +92,14 @@ module ForemanAnsible
 
     private
 
+    def get_results(msg_json)
+      results = msg_json.key?('results') ? msg_json['results'] : [msg_json]
+      results.map do |result|
+        module_args = result.fetch('invocation', {}).fetch('module_args', {})
+        yield module_args, result
+      end
+    end
+
     def parsed_message_json(log)
       JSON.parse(log.message.value)
     rescue StandardError => e

data/app/helpers/foreman_ansible/smart_proxies_helper.rb

@@ -27,7 +27,13 @@ module ForemanAnsible
     end
 
     def proxy_update_button(proxy)
-      feature = RemoteExecutionFeature.feature(:ansible_run_capsule_upgrade)
+      name = if Foreman::Plugin.find('foreman_theme_satellite').present?
+               :ansible_run_capsule_upgrade
+             else
+               :ansible_run_smart_proxy_upgrade
+             end
+
+      feature = RemoteExecutionFeature.feature(name)
       return if feature.nil?
 
       path = new_job_invocation_path(:host_ids => proxy.infrastructure_host_facets.pluck(:host_id),

data/app/views/foreman_ansible/config_reports/_ansible.html.erb

@@ -33,7 +33,7 @@
               <div class='pull-left'>
                 <%= truncate(log_message, length: allowed_length) %>
               </div>
-              <%= show_full_error_message_value(log_message) if log_message.length > allowed_length %>
+              <%= show_full_error_message_value(log_message) if (log_message&.length || 0) > allowed_length %>
             <% end %>
           </td>
         </tr>

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

@@ -1,5 +1,5 @@
 <%#
-name: Smart Proxy Upgrade Playbook
+name: Capsule Upgrade Playbook
 snippet: false
 template_inputs:
 - name: target_version
@@ -26,8 +26,8 @@ feature: ansible_run_capsule_upgrade
 - hosts: all
   vars:
     target_version: "<%= input('target_version').present? ? input('target_version') : product_short_version %>"
-<% if plugin_present?('foreman_theme_satellite') -%>
   tasks:
+<% if plugin_present?('foreman_theme_satellite') -%>
     - name: Gather the rpm package facts
       package_facts:
         manager: auto
@@ -75,35 +75,7 @@ feature: ansible_run_capsule_upgrade
           fail:
             msg: "Failed! Capsule server upgrade failed. See /var/log/foreman-installer/capsule.log in the Capsule server for more information"
 <% else -%>
-  tasks:
-    - name: Gather the rpm package facts
-      package_facts:
-        manager: auto
-
-    - name: Fail if the target server is a Foreman server
+    - name: Fail if foreman_theme_satellite is missing
       fail:
-        msg: "This playbook cannot be executed on a Foreman server. Use only on a Smart Proxy server."
-      when: "'foreman' in ansible_facts.packages"
-
-    - name: Install foreman release gpg key
-      rpm_key:
-        state: present
-        key: http://yum.theforeman.org/releases/{{ target_version }}/RPM-GPG-KEY-foreman
-      when: target_version != "nightly"
-
-    - name: Update foreman repositories
-      package:
-        name: https://yum.theforeman.org/releases/{{ target_version }}/el{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/foreman-release.rpm
-        state: installed
-
-    - name: Clean yum metadata
-      command: yum clean all
-
-    - name: Update all packages
-      package:
-        name: '*'
-        state: latest
-
-    - name: Run the installer
-      shell: foreman-installer
+        msg: "Failed! The plugin foreman_theme_satellite is not present. This playbook is only for use with Satellite."
 <% end -%>

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

@@ -0,0 +1,59 @@
+<%#
+name: Smart Proxy Upgrade Playbook
+snippet: false
+template_inputs:
+- name: target_version
+  required: false
+  input_type: user
+  advanced: false
+  value_type: plain
+  hidden_value: false
+- name: whitelist_options
+  required: false
+  input_type: user
+  advanced: false
+  value_type: plain
+  hidden_value: false
+model: JobTemplate
+job_category: Maintenance Operations
+description_format: "%{template_name}"
+provider_type: Ansible
+kind: job_template
+feature: ansible_run_smart_proxy_upgrade
+%>
+
+---
+- hosts: all
+  vars:
+    target_version: "<%= input('target_version').present? ? input('target_version') : product_short_version %>"
+  tasks:
+    - name: Gather the rpm package facts
+      package_facts:
+        manager: auto
+
+    - name: Fail if the target server is a Foreman server
+      fail:
+        msg: "This playbook cannot be executed on a Foreman server. Use only on a Smart Proxy server."
+      when: "'foreman' in ansible_facts.packages"
+
+    - name: Install foreman release gpg key
+      rpm_key:
+        state: present
+        key: http://yum.theforeman.org/releases/{{ target_version }}/RPM-GPG-KEY-foreman
+      when: target_version != "nightly"
+
+    - name: Update foreman repositories
+      package:
+        name: https://yum.theforeman.org/releases/{{ target_version }}/el{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/foreman-release.rpm
+        state: installed
+
+    - name: Clean yum metadata
+      command: yum clean all
+
+    - name: Update all packages
+      package:
+        name: '*'
+        state: latest
+
+    - name: Run the installer
+      shell: foreman-installer

data/db/migrate/20210818083407_fix_ansible_setting_category_to_dsl.rb

@@ -1,5 +1,5 @@
 class FixAnsibleSettingCategoryToDsl < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::Ansible').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::Ansible').update_all(category: 'Setting') if column_exists?(:settings, :category)
   end
 end

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 = '11.0.0'
+  VERSION = '11.1.1'
 end