foreman_ansible 18.0.5 → 18.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 386702b51a6e3fc6310aded83ac9d663dcfa77ef2fece39bdfbcc800036e4195
-  data.tar.gz: dfa188871137f74023324723685160eb63ed7f78dd3dbcddb993c8d4be74e248
+  metadata.gz: 95ba4dc9dc1a54f39ffe84c9d872a4fef4491b14f1833f1485be0a6ae2e098fa
+  data.tar.gz: fafc9d8a23b8338a810fac6af244183311904168f977da5ab1617cc05d5ce008
 SHA512:
-  metadata.gz: 810514e7b6b190bcf9b63525e0895c0acd7c103f1a97154b4157c54f89c607970a3e61e6a0027e58f35638ce7e3b3c3a0412517874628ccf37f59d115b5ef5d3
-  data.tar.gz: 8569b549a2859add69430a8b15cc7bd415b2e33e0d5471bd6d4fbf8d70f6dcf488e6162c8b043340d0190c5b6c53a6abfcf49d386ddcf665dc759d206086d7d8
+  metadata.gz: 505d75176112a40d0442f686c57c7ec8319a66e453967e6f1a4d22da0f65e05052fcce883faedb18b5be5eff53dac40d4bb7067ab87de8c0be977ffb0a42b572
+  data.tar.gz: '048cead5d8566cfeb65a935d25cecaeb6d7c3ff399570e9c3f2b9a3ab184392c818326893e82a4b6a707a308e8b8b18d747e37787c31a35d37bf7c68f8703327'

data/app/models/concerns/foreman_ansible/job_template_extensions.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ForemanAnsible
+  module JobTemplateExtensions
+    def self.prepended(base)
+      base.attr_exportable :ansible_callback_enabled
+    end
+
+    def import_custom_data(options)
+      super
+      self.ansible_callback_enabled = @importing_metadata['ansible_callback_enabled'] if @importing_metadata.key?('ansible_callback_enabled')
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ name: Ansible Roles - Ansible Default
 job_category: Ansible Playbook
 description_format: Run Ansible roles
 feature: ansible_run_host
+ansible_callback_enabled: true
 snippet: false
 provider_type: Ansible
 kind: job_template

data/lib/foreman_ansible/engine.rb

@@ -52,6 +52,7 @@ module ForemanAnsible
 
     config.to_prepare do
       ::Host::Managed.prepend ForemanAnsible::HostManagedExtensions
+      ::JobTemplate.prepend ForemanAnsible::JobTemplateExtensions
       ::Hostgroup.include ForemanAnsible::HostgroupExtensions
       ::HostsController.include ForemanAnsible::Concerns::HostsControllerExtensions
       ::Api::V2::HostsController.include ForemanAnsible::Api::V2::HostsControllerExtensions

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 = '18.0.5'
+  VERSION = '18.0.6'
 end

data/test/unit/job_template_extensions_test.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+class JobTemplateExtensionsTest < ActiveSupport::TestCase
+  describe 'Ansible callback metadata' do
+    let(:template_metadata) do
+      <<~ERB
+        <%#
+        name: Ansible Roles - Ansible Default
+        ansible_callback_enabled: true
+        model: JobTemplate
+        %>
+
+        ---
+        - hosts: all
+      ERB
+    end
+
+    it 'exports ansible_callback_enabled' do
+      template = JobTemplate.new(:ansible_callback_enabled => true)
+
+      assert(template.to_export['ansible_callback_enabled'])
+    end
+
+    it 'imports ansible_callback_enabled from template metadata' do
+      template = JobTemplate.new
+
+      template.import_without_save(template_metadata)
+
+      assert(template.ansible_callback_enabled)
+    end
+
+    it 'does not reset ansible_callback_enabled when metadata omits it' do
+      template = JobTemplate.new(:ansible_callback_enabled => true)
+
+      template.import_without_save("<%#\nname: Job template\nmodel: JobTemplate\n%>\n\n---")
+
+      assert(template.ansible_callback_enabled)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 18.0.5
+  version: 18.0.6
 platform: ruby
 authors:
 - Daniel Lobato Garcia
@@ -142,6 +142,7 @@ files:
 - app/models/ansible_variable.rb
 - app/models/concerns/foreman_ansible/host_managed_extensions.rb
 - app/models/concerns/foreman_ansible/hostgroup_extensions.rb
+- app/models/concerns/foreman_ansible/job_template_extensions.rb
 - app/models/foreman_ansible/ansible_provider.rb
 - app/models/host_ansible_role.rb
 - app/models/hostgroup_ansible_role.rb
@@ -326,6 +327,7 @@ files:
 - test/unit/ignore_roles_test.rb
 - test/unit/import_playbooks_test.rb
 - test/unit/import_roles_and_variables.rb
+- test/unit/job_template_extensions_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
 - test/unit/services/ansible_variables_importer_test.rb
@@ -501,6 +503,7 @@ test_files:
 - test/unit/ignore_roles_test.rb
 - test/unit/import_playbooks_test.rb
 - test/unit/import_roles_and_variables.rb
+- test/unit/job_template_extensions_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
 - test/unit/services/ansible_variables_importer_test.rb