foreman_ansible 10.0.1 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98a2c9aa6bcc8e2feb5b8eee62d111926d0dab191561f808399587d7462debbc
-  data.tar.gz: 2fc48fc5f59725cd8000229bdf08e68f5e8e53a1158271ce2d6db3766ab5826b
+  metadata.gz: c6ba3f014f5ac02d3364334eb15efeeb9572b802765a9d8ffea9be3d3fd19c3d
+  data.tar.gz: cc56b4ff89156afee500563975542d1a98d82bc49929d6f2c056fbcc74149500
 SHA512:
-  metadata.gz: a8be9228e0b1532cdbef43e88b0f7ba84f9bd8edc5a9d9e21e1ee6d601f63bbccf16eff5e146f33d18ea06d7cdd5adc528d310d7ddb723ff3a6b91ce3a6774c6
-  data.tar.gz: 35b55ca402a155fae45abd89c6fecde949d133e50b855473a25dba13df9452a13a5b9342b93e49fefd553902909a565dd59f9d57afb07d4f8efec6f0311057a9
+  metadata.gz: 91c980eef1c77f9d856dad9fff7acaca458bb17c5d8736cd50e11c87a2b01ccba5b87c07e025b57e1c4e493b91909607f4236107e99ab419faa66ac00b4b374c
+  data.tar.gz: 415fda190f9d33d7e31f34567aa4601724b789045e48813f0668a36e58bbf3a7ec414d99bdc8ca97ac9b564f55861b0ae678f1ef11cb197405572b51a52d083e

data/app/helpers/foreman_ansible/smart_proxies_helper.rb

@@ -0,0 +1,38 @@
+module ForemanAnsible
+  module SmartProxiesHelper
+    def can_update_proxy?(proxy)
+      hosts = proxy.smart_proxy_hosts
+
+      return if !can_schedule_jobs? ||
+                hosts.empty? ||
+                !hosts.all? { |host| can_execute_on_host?(host) }
+
+      begin
+        version = proxy.statuses[:version].version
+      rescue Foreman::Exception
+        return false
+      end
+
+      foreman_version = Foreman::Version.new
+      proxy_version = Foreman::Version.new(version['version'])
+
+      foreman_major = foreman_version.major.to_i
+      foreman_minor = foreman_version.minor.to_i
+
+      proxy_major = proxy_version.major.to_i
+      proxy_minor = proxy_version.minor.to_i
+
+      foreman_major > proxy_major ||
+        (foreman_major == proxy_major && foreman_minor > proxy_minor)
+    end
+
+    def proxy_update_button(proxy)
+      feature = RemoteExecutionFeature.feature(:ansible_run_capsule_upgrade)
+      return if feature.nil?
+
+      path = new_job_invocation_path(:host_ids => proxy.infrastructure_host_facets.pluck(:host_id),
+                                     :feature => feature.label)
+      link_to(_('Upgrade'), path)
+    end
+  end
+end

data/app/views/foreman/smart_proxies/_update_smart_proxy.html.erb

@@ -0,0 +1 @@
+<%= proxy_update_button(subject) %>

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

@@ -1,9 +1,9 @@
 <%#
-name: Capsule Upgrade Playbook
+name: Smart Proxy Upgrade Playbook
 snippet: false
 template_inputs:
 - name: target_version
-  required: true
+  required: false
   input_type: user
   advanced: false
   value_type: plain
@@ -24,6 +24,9 @@ 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:
     - name: Gather the rpm package facts
       package_facts:
@@ -44,7 +47,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=<%= input('target_version') %> <%= whitelist_option %>
+        shell: satellite-maintain upgrade run --assumeyes --target-version={{ target_version }} <%= whitelist_option %>
         register: result
 
       - name: Re-Gather the rpm package facts after the upgrade
@@ -71,3 +74,36 @@ feature: ansible_run_capsule_upgrade
         - name: satellite-maintain upgrade return code is non-zero
           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
+      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
+<% end -%>

data/db/migrate/20221031114720_rename_capsule_upgrade_playbook.rb

@@ -0,0 +1,21 @@
+class RenameCapsuleUpgradePlaybook < ActiveRecord::Migration[6.0]
+  MAPPING = {
+    'Capsule Upgrade Playbook' => 'Smart Proxy Upgrade Playbook'
+  }.freeze
+
+  def up
+    rename(MAPPING)
+  end
+
+  def down
+    rename(MAPPING.invert)
+  end
+
+  private
+
+  def rename(mapping)
+    mapping.each do |old, new|
+      Template.where(name: old).update_all(name: new)
+    end
+  end
+end

data/lib/foreman_ansible/register.rb

@@ -244,4 +244,17 @@ Foreman::Plugin.register :foreman_ansible do
   describe_hostgroup do
     hostgroup_actions_provider :ansible_hostgroups_actions
   end
+
+  extend_page('smart_proxies/show') do |context|
+    context.add_pagelet :smart_proxy_title_actions,
+                        :name => _('Update Smart Proxy'),
+                        :partial => 'foreman/smart_proxies/update_smart_proxy',
+                        :onlyif => ->(proxy, view) { view.can_update_proxy?(proxy) }
+  end
+  extend_page('smart_proxies/index') do |context|
+    context.add_pagelet :smart_proxy_title_actions,
+                        :name => _('Update Smart Proxy'),
+                        :partial => 'foreman/smart_proxies/update_smart_proxy',
+                        :onlyif => ->(proxy, view) { view.can_update_proxy?(proxy) }
+  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 = '10.0.1'
+  VERSION = '10.2.0'
 end

data/locale/action_names.rb

@@ -1,6 +1,5 @@
 # Autogenerated!
-_("Preupgrade job")
-_("Remote action:")
-_("Import Puppet classes")
+_("Action with sub plans")
 _("Import facts")
-_("Action with sub plans")
+_("Import Puppet classes")
+_("Remote action:")

data/locale/ca/foreman_ansible.po

@@ -4,14 +4,14 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 # Translators:
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2019
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2022
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 3.0.2\n"
+"Project-Id-Version: foreman_ansible 10.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
-"Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2019\n"
+"Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2022\n"
 "Language-Team: Catalan (https://www.transifex.com/foreman/teams/114/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,7 +49,7 @@ msgstr ""
 msgid "Add selected"
 msgstr ""
 
-msgid "Add, remove or reorder host assigned Ansible roles. This host has also group assigned roles that are not displayed here and will always be executed prior to host assigned roles"
+msgid "Add, remove or reorder host assigned Ansible roles. This host has also group assigned roles that are not displayed here and will always be executed prior to host assigned roles."
 msgstr ""
 
 msgid "All assigned Ansible roles"
@@ -136,7 +136,7 @@ msgstr ""
 msgid "Are you sure you want to delete override for %s?"
 msgstr ""
 
-msgid "Assign Ansible roles"
+msgid "Assign roles directly to the host"
 msgstr ""
 
 msgid "Assigned Ansible Roles"
@@ -169,14 +169,8 @@ msgstr ""
 msgid "Changed Ansible roles"
 msgstr ""
 
-msgid "Clone"
-msgstr "Clona"
-
 msgid "Close"
-msgstr ""
-
-msgid "Configure Ansible Job"
-msgstr ""
+msgstr "Tanca"
 
 msgid "Configure Recurring Job"
 msgstr ""
@@ -221,7 +215,7 @@ msgid "Default Behavior"
 msgstr ""
 
 msgid "Default value"
-msgstr ""
+msgstr "Valor per defecte"
 
 msgid "Default value of variable"
 msgstr "Valor per defecte de la variable"
@@ -230,7 +224,7 @@ msgid "Default verbosity level"
 msgstr ""
 
 msgid "Delete"
-msgstr ""
+msgstr "Suprimeix"
 
 msgid "Delete %s?"
 msgstr "Voleu suprimir %s?"
@@ -245,7 +239,7 @@ msgid "Deletes Ansible variable"
 msgstr ""
 
 msgid "Description"
-msgstr ""
+msgstr "Descripció"
 
 msgid "Description of variable"
 msgstr "Descripció de la variable"
@@ -295,6 +289,9 @@ msgstr ""
 msgid "Fetch Ansible roles available to be synced"
 msgstr ""
 
+msgid "For more advanced scheduling options"
+msgstr ""
+
 msgid "Foreman"
 msgstr ""
 
@@ -460,9 +457,6 @@ msgstr "Nom"
 msgid "Name of variable"
 msgstr "Nom de la variable"
 
-msgid "Nest"
-msgstr ""
-
 msgid "New Ansible Variable"
 msgstr ""
 
@@ -504,6 +498,9 @@ msgstr ""
 msgid "No proxy found to import variables from, ensure that the smart proxy has the Ansible feature enabled."
 msgstr ""
 
+msgid "No roles assigned directly to the host"
+msgstr ""
+
 msgid "Nothing Found!"
 msgstr ""
 
@@ -541,7 +538,7 @@ msgid "Permission Denied"
 msgstr ""
 
 msgid "Permission denied"
-msgstr ""
+msgstr "Permís denegat"
 
 msgid "Playbooks"
 msgstr ""
@@ -552,9 +549,6 @@ msgstr ""
 msgid "Post-provision timeout"
 msgstr ""
 
-msgid "Preupgrade job"
-msgstr ""
-
 msgid "Previously executed jobs"
 msgstr ""
 
@@ -597,9 +591,12 @@ msgstr ""
 msgid "Request the following permissions from administrator: %s."
 msgstr ""
 
-msgid "Result"
+msgid "Required field"
 msgstr ""
 
+msgid "Result"
+msgstr "Resultat"
+
 msgid "Role ID"
 msgstr ""
 
@@ -651,6 +648,9 @@ msgstr ""
 msgid "Schedule generating of Ansible Inventory report"
 msgstr ""
 
+msgid "Schedule recurring Ansible roles job"
+msgstr ""
+
 msgid "Schedule recurring job"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgid "Smart proxy id is required"
 msgstr ""
 
 msgid "Source"
-msgstr ""
+msgstr "Origen"
 
 msgid "Source attribute"
 msgstr ""
@@ -694,10 +694,10 @@ msgid "Specify Matchers"
 msgstr ""
 
 msgid "State"
-msgstr ""
+msgstr "Estat"
 
 msgid "Submit"
-msgstr ""
+msgstr "Envia"
 
 msgid "Sync Ansible playbooks"
 msgstr ""
@@ -706,10 +706,10 @@ msgid "Sync Ansible roles"
 msgstr ""
 
 msgid "Tags"
-msgstr ""
+msgstr "Etiquetes"
 
 msgid "Task"
-msgstr ""
+msgstr "Tasca"
 
 msgid "Task Details"
 msgstr ""
@@ -747,7 +747,10 @@ msgstr ""
 msgid "This Ansible role is inherited from parent host group"
 msgstr ""
 
-msgid "This list consists of host assigned roles and group assigned roles. Group assigned roles will always be executed prior to host assigned roles"
+msgid "This job will run all the assigned Ansible roles."
+msgstr ""
+
+msgid "This list consists of host assigned roles and group assigned roles. Group assigned roles will always be executed prior to host assigned roles."
 msgstr ""
 
 msgid "Those roles will be excluded when importing roles from smart proxy, The expected input is comma separated values and you can use * wildcard metacharactersFor example: foo*, *b*,*bar"
@@ -786,9 +789,15 @@ msgstr "Actualitza"
 msgid "Update Role Variables"
 msgstr ""
 
+msgid "Update Smart Proxy"
+msgstr ""
+
 msgid "Updates Ansible variable"
 msgstr ""
 
+msgid "Upgrade"
+msgstr ""
+
 msgid "Upgrade Capsules on given Capsule server hosts"
 msgstr ""
 
@@ -811,7 +820,7 @@ msgid "Used to enforce certain values for the parameter values"
 msgstr ""
 
 msgid "Value"
-msgstr ""
+msgstr "Valor"
 
 msgid "Value to use when there is no match."
 msgstr ""
@@ -825,6 +834,9 @@ msgstr ""
 msgid "Variable|Role"
 msgstr ""
 
+msgid "View inherited roles"
+msgstr ""
+
 msgid "When enabled the parameter is hidden in the UI"
 msgstr ""
 
@@ -835,14 +847,11 @@ msgid "WinRM cert Validation"
 msgstr ""
 
 msgid "You are not authorized to perform this action."
-msgstr ""
+msgstr "No esteu autoritzat a realitzar aquesta acció."
 
 msgid "You are not authorized to view the page. "
 msgstr ""
 
-msgid "can't be blank"
-msgstr ""
-
 msgid "daily"
 msgstr ""
 
@@ -864,6 +873,9 @@ msgstr ""
 msgid "view all assigned roles"
 msgstr ""
 
+msgid "view remote execution page."
+msgstr ""
+
 msgid "view the task in progress"
 msgstr ""