foreman_ansible 14.2.1 → 15.0.0

data/app/controllers/ansible_roles_controller.rb

@@ -46,7 +46,7 @@ class AnsibleRolesController < ::ApplicationController
   end
 
   def create_importer
-    @importer = ForemanAnsible::UiRolesImporter.new(@proxy)
+    @importer = ForemanAnsible::UIRolesImporter.new(@proxy)
     @variables_importer = ForemanAnsible::VariablesImporter.new(@proxy)
   end
 

data/app/controllers/ansible_variables_controller.rb

@@ -92,7 +92,7 @@ class AnsibleVariablesController < ::LookupKeysController
 
   def create_importer
     @importer = ForemanAnsible::VariablesImporter.new(@proxy)
-    @importer_roles = ForemanAnsible::UiRolesImporter.new(@proxy)
+    @importer_roles = ForemanAnsible::UIRolesImporter.new(@proxy)
   end
 
   def find_required_proxy

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

@@ -98,7 +98,7 @@ module Api
       # rubocop:enable Layout/DotPosition
 
       def create_importer
-        @roles_importer = ForemanAnsible::UiRolesImporter.new(@proxy)
+        @roles_importer = ForemanAnsible::UIRolesImporter.new(@proxy)
         @variables_importer = ForemanAnsible::VariablesImporter.new(@proxy)
         @importer = ForemanAnsible::ApiRolesImporter.new(@proxy)
       end

data/app/controllers/ui_ansible_roles_controller.rb

@@ -1,4 +1,4 @@
-class UiAnsibleRolesController < ::Api::V2::BaseController
+class UIAnsibleRolesController < ::Api::V2::BaseController
   def resource_name(resource = 'AnsibleRole')
     super resource
   end

data/app/jobs/sync_roles_and_variables.rb

@@ -2,7 +2,7 @@ class SyncRolesAndVariables < ::ApplicationJob
   queue_as :default
 
   def perform(changed, proxy)
-    roles_importer = ForemanAnsible::UiRolesImporter.new(proxy)
+    roles_importer = ForemanAnsible::UIRolesImporter.new(proxy)
     variables_importer = ForemanAnsible::VariablesImporter.new(proxy)
     roles_importer.finish_import(changed)
     variables_importer.import_variables_roles(changed) if changed['new'] || changed['old']

data/app/models/ansible_role.rb

@@ -4,6 +4,7 @@
 class AnsibleRole < ApplicationRecord
   audited
   include Authorizable
+  include Foreman::ObservableModel
 
   self.include_root_in_json = false
   validates :name, :presence => true, :uniqueness => true
@@ -28,6 +29,8 @@ class AnsibleRole < ApplicationRecord
   scoped_search :relation => :hostgroups,
                 :on => :name, :rename => :hostgroup, :only_explicit => true
 
+  set_crud_hooks :ansible_role
+
   apipie :class, "A class representing #{model_name.human} object" do
     name 'Ansible role'
     refs 'AnsibleRole'

data/app/models/ansible_variable.rb

@@ -2,6 +2,8 @@
 
 # Represents the variables used in Ansible to parameterize playbooks
 class AnsibleVariable < LookupKey
+  include Foreman::ObservableModel
+
   belongs_to :ansible_role, :inverse_of => :ansible_variables
   validates :ansible_role_id, :presence => true
   before_validation :cast_default_value, :if => :override?
@@ -11,6 +13,8 @@ class AnsibleVariable < LookupKey
   scoped_search :relation => :ansible_role, :on => :name,
                 :complete_value => true, :rename => :ansible_role
 
+  set_crud_hooks :ansible_variable
+
   def ansible?
     true
   end

data/app/models/host_ansible_role.rb

@@ -2,10 +2,16 @@
 
 # Join model that hosts the connection between hosts and ansible_roles
 class HostAnsibleRole < ApplicationRecord
+  audited associated_with: :host
+
   belongs_to_host
   belongs_to :ansible_role
   acts_as_list scope: :host
 
   validates :ansible_role_id, :presence => true,
                               :uniqueness => { :scope => :host_id }
+
+  def to_label
+    ansible_role.name
+  end
 end

data/app/services/foreman_ansible/api_roles_importer.rb

@@ -6,7 +6,7 @@ module ForemanAnsible
     include ::ForemanAnsible::AnsibleRolesDataPreparations
 
     def import!(role_names)
-      @roles_importer = ForemanAnsible::UiRolesImporter.new(@ansible_proxy)
+      @roles_importer = ForemanAnsible::UIRolesImporter.new(@ansible_proxy)
       @variables_importer = ForemanAnsible::VariablesImporter.new(@ansible_proxy)
       params = { 'changed' => {} }
       roles = prepare_ansible_import_rows(@roles_importer.import!, @variables_importer, false)

data/app/services/foreman_ansible/ui_roles_importer.rb

@@ -2,7 +2,7 @@
 
 module ForemanAnsible
   # imports ansible roles through UI
-  class UiRolesImporter < RolesImporter
+  class UIRolesImporter < RolesImporter
     def import!
       import_role_names
     end

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

@@ -0,0 +1,73 @@
+<%#
+name: Capsule Update Playbook
+snippet: false
+template_inputs:
+- 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_capsule_update
+%>
+
+---
+- hosts: all
+  tasks:
+<% if plugin_present?('foreman_theme_satellite') -%>
+    - name: Gather the rpm package facts
+      package_facts:
+        manager: auto
+
+    - name: Fail if the target server is a Satellite server
+      fail:
+        msg: "This playbook cannot be executed on a Satellite server. Use only on a Capsule server."
+      when: "'satellite' in ansible_facts.packages"
+
+    - name: Install|Update satellite-maintain if not present
+      package:
+        name: rubygem-foreman_maintain
+        state: latest
+
+    - block:
+      <%- whitelist_option = if input('whitelist_options').present?
+                               "--whitelist=#{input('whitelist_options')}"
+                             end -%>
+      - name: Update Capsule server using satellite-maintain
+        shell: satellite-maintain update run --assumeyes <%= whitelist_option %>
+        register: result
+
+      - name: Re-Gather the rpm package facts after the update
+        package_facts:
+          manager: auto
+
+      - name: satellite-maintain update return code is zero
+        debug:
+          msg: "Success! Capsule server update completed. Current version of Capsule server server is {{ ansible_facts.packages['satellite-capsule'][0]['version'] }}."
+
+      rescue:
+        - name: Print satellite-maintain output
+          debug:
+            var: result
+
+        - name: Grep top 10 Error messages from /var/log/foreman-installer/capsule.log
+          shell: grep '^\[ERROR' /var/log/foreman-installer/capsule.log | head -n10
+          register: output_grep
+
+        - name: Print grepped Error messages
+          debug:
+            var: output_grep.stdout_lines
+
+        - name: satellite-maintain update return code is non-zero
+          fail:
+            msg: "Failed! Capsule server update failed. See /var/log/foreman-installer/capsule.log in the Capsule server for more information"
+<% else -%>
+    - name: Fail if foreman_theme_satellite is missing
+      fail:
+        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/capsule_upgrade_-_ansible_default.erb

@@ -24,8 +24,6 @@ feature: ansible_run_capsule_upgrade
 
 ---
 - hosts: all
-  vars:
-    target_version: "<%= input('target_version').present? ? input('target_version') : product_short_version %>"
   tasks:
 <% if plugin_present?('foreman_theme_satellite') -%>
     - name: Gather the rpm package facts
@@ -47,7 +45,7 @@ feature: ansible_run_capsule_upgrade
                                "--whitelist=#{input('whitelist_options')}"
                              end -%>
       - name: Upgrade Capsule server using satellite-maintain
-        shell: satellite-maintain upgrade run --assumeyes --target-version={{ target_version }} <%= whitelist_option %>
+        shell: satellite-maintain upgrade run --assumeyes <%= whitelist_option %>
         register: result
 
       - name: Re-Gather the rpm package facts after the upgrade

data/lib/foreman_ansible/engine.rb

@@ -11,16 +11,10 @@ module ForemanAnsible
   class Engine < ::Rails::Engine
     engine_name 'foreman_ansible'
 
-    config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/models"]
-    config.autoload_paths += Dir["#{config.root}/app/helpers"]
-    config.autoload_paths += Dir["#{config.root}/app/overrides"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
-    config.autoload_paths += Dir["#{config.root}/app/views"]
-    config.autoload_paths += Dir["#{config.root}/app/lib"]
-
-    initializer 'foreman_ansible.register_plugin', :before => :finisher_hook do
-      require 'foreman_ansible/register'
+    initializer 'foreman_ansible.register_plugin', :before => :finisher_hook do |app|
+      app.reloader.to_prepare do
+        require 'foreman_ansible/register'
+      end
     end
 
     initializer('foreman_ansible.require_dynflow',

data/lib/foreman_ansible/register.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Foreman::Plugin.register :foreman_ansible do
-  requires_foreman '>= 3.10.0'
+  requires_foreman '>= 3.13.0'
   register_gettext
 
   settings do

data/lib/foreman_ansible/remote_execution.rb

@@ -40,6 +40,12 @@ module ForemanAnsible
         :description => N_('Upgrade Capsules on given Capsule server hosts'),
         :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
       )
+      RemoteExecutionFeature.register(
+        :ansible_run_capsule_update,
+        N_('Update Capsules on given hosts'),
+        :description => N_('Update Capsules on given Capsule server hosts'),
+        :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
+      )
     end
   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 = '14.2.1'
+  VERSION = '15.0.0'
 end

data/locale/ca/foreman_ansible.po

@@ -34,9 +34,6 @@ msgstr ""
 msgid "A comma separated list of tags to use for Ansible run"
 msgstr ""
 
-msgid "Action with sub plans"
-msgstr ""
-
 msgid "Actions"
 msgstr "Accions"
 
@@ -139,9 +136,6 @@ msgstr ""
 msgid "Ansible variable override was successfully deleted."
 msgstr ""
 
-msgid "Ansible: Run Insights maintenance plan"
-msgstr ""
-
 msgid "Are you sure you want to cancel Ansible config job?"
 msgstr ""
 
@@ -181,9 +175,6 @@ msgstr ""
 msgid "Changed Ansible roles"
 msgstr ""
 
-msgid "Check for long running tasks"
-msgstr ""
-
 msgid "Close"
 msgstr "Tanca"
 
@@ -256,9 +247,6 @@ msgstr ""
 msgid "Deletes Ansible variable"
 msgstr ""
 
-msgid "Deliver notifications about long running tasks"
-msgstr ""
-
 msgid "Description"
 msgstr "Descripció"
 
@@ -388,15 +376,9 @@ msgstr "En cas que estigui marcat, es produirà un error si no hi ha cap valor p
 msgid "Import"
 msgstr "Importa"
 
-msgid "Import Puppet classes"
-msgstr ""
-
 msgid "Import Role"
 msgstr ""
 
-msgid "Import facts"
-msgstr ""
-
 msgid "Import from %s"
 msgstr "Importa de %s"
 
@@ -433,9 +415,6 @@ msgstr ""
 msgid "Inherited from Hostgroup"
 msgstr ""
 
-msgid "Insights remediation on %{hosts_count} host(s) has finished successfully"
-msgstr ""
-
 msgid "Invalid, expected one of: %s"
 msgstr ""
 
@@ -445,9 +424,6 @@ msgstr ""
 msgid "Inventory"
 msgstr ""
 
-msgid "Job Details"
-msgstr ""
-
 msgid "Jobs"
 msgstr "Treballs"
 
@@ -612,12 +588,6 @@ msgstr ""
 msgid "Proxy tasks batch size for Ansible"
 msgstr ""
 
-msgid "Remediation Plan"
-msgstr ""
-
-msgid "Remote action:"
-msgstr ""
-
 msgid "Remove"
 msgstr "Suprimeix"
 
@@ -678,9 +648,6 @@ msgstr ""
 msgid "Run playbook"
 msgstr ""
 
-msgid "Runs a given maintenance plan from Red Hat Access Insights given an ID."
-msgstr ""
-
 msgid "Runs all Ansible roles on a host"
 msgstr ""
 
@@ -843,6 +810,12 @@ msgstr ""
 msgid "Update"
 msgstr "Actualitza"
 
+msgid "Update Capsules on given Capsule server hosts"
+msgstr ""
+
+msgid "Update Capsules on given hosts"
+msgstr ""
+
 msgid "Update Role Variables"
 msgstr ""
 

data/locale/cs_CZ/foreman_ansible.po

@@ -38,9 +38,6 @@ msgstr ""
 msgid "A comma separated list of tags to use for Ansible run"
 msgstr ""
 
-msgid "Action with sub plans"
-msgstr "Akce s dílčími plány"
-
 msgid "Actions"
 msgstr "Akce"
 
@@ -143,9 +140,6 @@ msgstr ""
 msgid "Ansible variable override was successfully deleted."
 msgstr ""
 
-msgid "Ansible: Run Insights maintenance plan"
-msgstr ""
-
 msgid "Are you sure you want to cancel Ansible config job?"
 msgstr ""
 
@@ -185,9 +179,6 @@ msgstr ""
 msgid "Changed Ansible roles"
 msgstr "Změněné Ansible role"
 
-msgid "Check for long running tasks"
-msgstr ""
-
 msgid "Close"
 msgstr "Zavřít"
 
@@ -260,9 +251,6 @@ msgstr "Smazat Ansible roli"
 msgid "Deletes Ansible variable"
 msgstr "Smazat Ansible proměnnou"
 
-msgid "Deliver notifications about long running tasks"
-msgstr ""
-
 msgid "Description"
 msgstr "Popis"
 
@@ -392,15 +380,9 @@ msgstr ""
 msgid "Import"
 msgstr "Import"
 
-msgid "Import Puppet classes"
-msgstr "Importovat Puppet třídy"
-
 msgid "Import Role"
 msgstr ""
 
-msgid "Import facts"
-msgstr "Importovat fakta"
-
 msgid "Import from %s"
 msgstr "Importovat z %s"
 
@@ -437,9 +419,6 @@ msgstr ""
 msgid "Inherited from Hostgroup"
 msgstr ""
 
-msgid "Insights remediation on %{hosts_count} host(s) has finished successfully"
-msgstr ""
-
 msgid "Invalid, expected one of: %s"
 msgstr ""
 
@@ -449,9 +428,6 @@ msgstr ""
 msgid "Inventory"
 msgstr ""
 
-msgid "Job Details"
-msgstr "Podrobnosti o úloze"
-
 msgid "Jobs"
 msgstr "Úlohy"
 
@@ -616,12 +592,6 @@ msgstr "Proxy nenalezena"
 msgid "Proxy tasks batch size for Ansible"
 msgstr ""
 
-msgid "Remediation Plan"
-msgstr ""
-
-msgid "Remote action:"
-msgstr "Akce na protějšku:"
-
 msgid "Remove"
 msgstr "Odebrat"
 
@@ -682,9 +652,6 @@ msgstr ""
 msgid "Run playbook"
 msgstr ""
 
-msgid "Runs a given maintenance plan from Red Hat Access Insights given an ID."
-msgstr ""
-
 msgid "Runs all Ansible roles on a host"
 msgstr ""
 
@@ -844,6 +811,12 @@ msgstr "Nedaří se získat role/proměnné z Ansible"
 msgid "Update"
 msgstr "Aktualizovat"
 
+msgid "Update Capsules on given Capsule server hosts"
+msgstr ""
+
+msgid "Update Capsules on given hosts"
+msgstr ""
+
 msgid "Update Role Variables"
 msgstr ""
 

data/locale/de/foreman_ansible.po

@@ -47,9 +47,6 @@ msgstr ""
 msgid "A comma separated list of tags to use for Ansible run"
 msgstr ""
 
-msgid "Action with sub plans"
-msgstr "Aktion mit Unterplänen"
-
 msgid "Actions"
 msgstr "Aktionen"
 
@@ -152,9 +149,6 @@ msgstr ""
 msgid "Ansible variable override was successfully deleted."
 msgstr ""
 
-msgid "Ansible: Run Insights maintenance plan"
-msgstr "Ansible: Insights-Wartungsplan ausführen"
-
 msgid "Are you sure you want to cancel Ansible config job?"
 msgstr ""
 
@@ -194,9 +188,6 @@ msgstr ""
 msgid "Changed Ansible roles"
 msgstr "Geänderte Ansible-Rollen"
 
-msgid "Check for long running tasks"
-msgstr ""
-
 msgid "Close"
 msgstr "Schließen"
 
@@ -269,9 +260,6 @@ msgstr "Löscht die Ansible-Rolle"
 msgid "Deletes Ansible variable"
 msgstr "Löscht die Ansible-Variable"
 
-msgid "Deliver notifications about long running tasks"
-msgstr ""
-
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -401,15 +389,9 @@ msgstr "Falls aktiviert, wird dies einen Fehler erzeugen, wenn kein Standardwert
 msgid "Import"
 msgstr "Importieren"
 
-msgid "Import Puppet classes"
-msgstr "Puppet-Klassen importieren"
-
 msgid "Import Role"
 msgstr "Rolle importieren"
 
-msgid "Import facts"
-msgstr "Fakten importieren"
-
 msgid "Import from %s"
 msgstr "Aus %s importieren"
 
@@ -446,9 +428,6 @@ msgstr ""
 msgid "Inherited from Hostgroup"
 msgstr ""
 
-msgid "Insights remediation on %{hosts_count} host(s) has finished successfully"
-msgstr "Insights-Korrektur auf %{hosts_count} Host(s) wurde erfolgreich abgeschlossen"
-
 msgid "Invalid, expected one of: %s"
 msgstr ""
 
@@ -458,9 +437,6 @@ msgstr ""
 msgid "Inventory"
 msgstr "Bestand"
 
-msgid "Job Details"
-msgstr "Auftragsdetails"
-
 msgid "Jobs"
 msgstr "Aufträge"
 
@@ -625,12 +601,6 @@ msgstr "Kein Proxy gefunden"
 msgid "Proxy tasks batch size for Ansible"
 msgstr ""
 
-msgid "Remediation Plan"
-msgstr "Sanierungsplan"
-
-msgid "Remote action:"
-msgstr "Entfernte Aktion"
-
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -691,9 +661,6 @@ msgstr ""
 msgid "Run playbook"
 msgstr "Playbook ausführen"
 
-msgid "Runs a given maintenance plan from Red Hat Access Insights given an ID."
-msgstr "Führt einen bestimmten Wartungsplan von Red Hat Access Insights mit einer ID aus."
-
 msgid "Runs all Ansible roles on a host"
 msgstr "Führt alle Ansible-Rollen auf einem Host aus"
 
@@ -853,6 +820,12 @@ msgstr "Rollen/Variablen von Ansible können nicht abgerufen werden"
 msgid "Update"
 msgstr "Aktualisieren"
 
+msgid "Update Capsules on given Capsule server hosts"
+msgstr ""
+
+msgid "Update Capsules on given hosts"
+msgstr ""
+
 msgid "Update Role Variables"
 msgstr "Rollenvariablen entfernen"