foreman_ansible 12.0.4 → 12.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22cc24fd5fb87553931501f3210e8d72610544b2a5d212b1d2f428ec93145f07
-  data.tar.gz: afb38c5c00658c8ca6d5f6e9f3d5a366b8d59a3f19a390905f266751998283b7
+  metadata.gz: 07d888a82b968caca3ffd9beedfe82d193fd884daf39e11b6733adb568c429ec
+  data.tar.gz: 0ba07c7fdfcde767ccada3f02b4ce059299538d6d58b2af8892285b2a1892b1e
 SHA512:
-  metadata.gz: 63670d49e925b97f3681dd76e608f4184ddc767e43da27427b4b6995518d261ecc4979f1aa06010fe15d102556f70a6e01e8fbe720e7bb3c4664aa84b8881386
-  data.tar.gz: a0fcb6a2004173a0847ca85a2ef648136575787d4525e553bf08f94f05a5d4d46ef42bbc7c198b9edd7daa3a2cf5c489eba549a27b67ca1344eb25ac21013751
+  metadata.gz: cf8f214d967994b1dd34cc0424c2fc587637e210659b5fa9ef102f1efc2da59fb09a50a5eafae56e854fa136a1aac0b76ee37021f0d96e40d5beaf51ff39dc78
+  data.tar.gz: d0f92731bf028681ee9de4fd351074548d1f07e87a5bbcfbb8b852aafc90269a39194b3099ef3ab2286c465f69137a342b7d06736ba6b1020e9a8ea2365c3215

data/app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb

@@ -50,7 +50,7 @@ module ForemanAnsible
             @inherited_ansible_roles = @hostgroup.inherited_ansible_roles
             @directly_assigned_roles = @hostgroup.ansible_roles
             @ansible_roles = (
-              @directly_assigned_roles + @inherited_ansible_roles + @hostgroup.host_ansible_roles
+              @directly_assigned_roles + @inherited_ansible_roles
             ).uniq
           end
 

data/app/views/foreman_ansible/job_templates/convert_to_rhel.erb

@@ -26,7 +26,7 @@ template_inputs:
   input_type: user
   description: "The convert2rhel utility uploads the following data about the system
     conversion to Red Hat servers for the purpose of the utility usage analysis:<br>\r\n-
-    The conver2rhel command as executed<br>\r\n- The convert2rhel RPM version and
+    The convert2rhel command as executed<br>\r\n- The convert2rhel RPM version and
     GPG signature<br>\r\n- Success or failure status of the conversion<br>\r\n- Conversion
     start and end timestamps<br>\r\n- Source OS vendor and version<br>\r\n- Target
     RHEL version<br>\r\n- convert2rhel related environment variables<br>"

data/db/seeds.d/75_job_templates.rb

@@ -2,6 +2,16 @@
 
 organizations = Organization.unscoped.all
 locations = Location.unscoped.all
+
+template_files = Dir[File.join("#{ForemanAnsible::Engine.root}/app/views/foreman_ansible/job_templates/**/*.erb")]
+
+unsupported_templates =
+  if Foreman::Plugin.find('foreman_theme_satellite').present?
+    { 'Smart Proxy Upgrade Playbook': 'smart_proxy_upgrade_-_ansible_default.erb' }
+  else
+    { 'Capsule Upgrade Playbook': 'capsule_upgrade_-_ansible_default.erb' }
+  end
+
 User.as_anonymous_admin do
   RemoteExecutionFeature.without_auditing do
     if Rails.env.test? || Foreman.in_rake?
@@ -13,8 +23,7 @@ User.as_anonymous_admin do
       ForemanAnsible::Engine.register_rex_feature
     end
     JobTemplate.without_auditing do
-      Dir[File.join("#{ForemanAnsible::Engine.root}/app/views/foreman_ansible/"\
-                    'job_templates/**/*.erb')].each do |template|
+      template_files.reject { |template| unsupported_templates.value?(File.basename(template)) }.each do |template|
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
         template = JobTemplate.import_raw!(File.read(template),
                                            :default => true,
@@ -23,6 +32,13 @@ User.as_anonymous_admin do
         template.organizations = organizations if template.present?
         template.locations = locations if template.present?
       end
+
+      unsupported_templates_in_db = JobTemplate.where(name: unsupported_templates.keys)
+
+      if unsupported_templates_in_db.any?
+        unsupported_templates_in_db.update_all(locked: false)
+        unsupported_templates_in_db.destroy_all
+      end
     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 = '12.0.4'
+  VERSION = '12.0.6'
 end

data/package.json

@@ -18,7 +18,6 @@
     "@theforeman/builder": ">= 12.0.1",
     "@theforeman/eslint-plugin-foreman": ">= 12.0.1",
     "@theforeman/find-foreman": ">= 12.0.1",
-    "@theforeman/stories": ">= 12.0.1",
     "@theforeman/test": ">= 12.0.1",
     "@theforeman/vendor-dev": ">= 12.0.1",
     "babel-eslint": "^10.0.3",

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/AnsibleVariableOverridesTableHelper.js

@@ -4,8 +4,13 @@ import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 
 import { showToast } from '../../../../toastHelper';
 
-const formatSourceLink = currentValue =>
-  `${__(currentValue.element)}: ${currentValue.elementName}`;
+function formatSourceLink(currentValue) {
+  const element =
+    typeof currentValue.element !== 'string'
+      ? currentValue.element.toString()
+      : currentValue.element;
+  return `${__(element)}: ${currentValue.elementName}`;
+}
 
 export const formatSourceAttr = variable =>
   variable.currentValue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 12.0.4
+  version: 12.0.6
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list