foreman_ansible 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ee1b4acb26925c919a3d2b3c8b9efe6bd355dc603d896d642a0150d9364f86b
-  data.tar.gz: b5fb045a0cfddf957c238f311b29f97a56b0b5fc91999b56ca25ee3f4c0eeda4
+  metadata.gz: aa5982c235f7ca52e9976e1bf0f67dffb08b844421f11caad977e15afabcba7d
+  data.tar.gz: 1ff9a41c74857925e1fc9c4e01cbf85b799e95bc7b9bccec42d2c4cf25ed1fc8
 SHA512:
-  metadata.gz: 529107a643fb300fc1755a3efe8bbb1bb94b726c822c93f568e3001d2acc71658499343952bce1191ca2e142d1abc3548525a3fdfbde2c8fe1a2f645923b366c
-  data.tar.gz: 2874526de96c18b4aafd6fcaa29006c1d910ccb0e87b1f3326d64312c510cc496fc4e49fd176fafb3f465bded12a2b9c26768dfc0833b628c1538659279cd6a6
+  metadata.gz: 5aa852e92c33636b1abc32204f843d21a8c93b735bf364f6bcdd1276356b51a08b21fdfa0b6936ba346dfa8b46146b454da32836de9cb4b4aa7f87d50c99e88c
+  data.tar.gz: 15c54c485deaad7abfc669f89463a2782d5de89e2d175aab4171d59ea91746c1928265c04c8ec64047014b529e2d3ed38f2fe625e6f5a2dc43b5b0db9060edfa

data/app/models/foreman_ansible/ansible_provider.rb

@@ -66,14 +66,6 @@ if defined? ForemanRemoteExecution
           'ForemanAnsibleCore::TaskLauncher::Playbook::PlaybookRunnerAction'
         end
 
-        def required_proxy_selector_for(template)
-          if template.remote_execution_features.where(:label => 'ansible_run_capsule_upgrade').any?
-            ::DefaultProxyProxySelector.new
-          else
-            super
-          end
-        end
-
         private
 
         def ansible_command?(template)

data/app/services/foreman_ansible/variables_importer.rb

@@ -78,7 +78,7 @@ module ForemanAnsible
     def create_new_variables(variables)
       iterate_over_variables(variables) do |role, memo, attrs|
         variable = AnsibleVariable.new(
-          JSON.parse(attrs)['ansible_variable']
+          JSON.parse(attrs)
         )
         variable.ansible_role = ::AnsibleRole.find_by(:name => role)
         variable.save
@@ -88,7 +88,7 @@ module ForemanAnsible
 
     def update_variables(variables)
       iterate_over_variables(variables) do |_role, memo, attrs|
-        attributes = JSON.parse(attrs)['ansible_variable']
+        attributes = JSON.parse(attrs)
         var = AnsibleVariable.find attributes['id']
         var.update(attributes)
         memo << var
@@ -98,7 +98,7 @@ module ForemanAnsible
     def delete_old_variables(variables)
       iterate_over_variables(variables) do |_role, memo, attrs|
         variable = AnsibleVariable.find(
-          JSON.parse(attrs)['ansible_variable']['id']
+          JSON.parse(attrs)['id']
         )
         memo << variable.key
         variable.destroy

data/app/views/ansible_roles/welcome.html.erb

@@ -4,7 +4,7 @@
     <%= icon_text("play", "", :kind => "fa") %>
   </div>
   <h1><%= _('Ansible Roles') %></h1>
-  <p><%= _('No ansible roles were found in Foreman. If you want to assign roles to your hosts,
+  <p><%= _('No Ansible Roles were found in Foreman. If you want to assign roles to your hosts,
              you have to import them first.').html_safe %>
   </p>
   <p><%= link_to(_('Learn more about this in the documentation.'), documentation_url('#4.1ImportingRoles', :root_url => ansible_doc_url), target: '_blank') %></p>

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

@@ -26,6 +26,7 @@ job_category: Maintenance Operations
 description_format: "%{template_name}"
 provider_type: Ansible
 kind: job_template
+feature: ansible_configure_cloud_connector
 %>
 
 ---

data/app/views/foreman_ansible/job_templates/service_action_-_enable_web_console.erb

@@ -0,0 +1,16 @@
+<%#
+name: Service Action - Enable Web Console
+job_category: Ansible Services
+snippet: false
+provider_type: Ansible
+kind: job_template
+model: JobTemplate
+feature: ansible_enable_web_console
+%>
+---
+- hosts: all
+  tasks:
+  - name: ensure cockpit is installed
+    package:
+      name: "cockpit-system"
+      state: present

data/lib/foreman_ansible/remote_execution.rb

@@ -45,7 +45,14 @@ module ForemanAnsible
       RemoteExecutionFeature.register(
         :ansible_run_capsule_upgrade,
         N_('Upgrade Capsules on given hosts'),
-        :description => N_('Upgrade Capsules on given Capsule server hosts')
+        :description => N_('Upgrade Capsules on given Capsule server hosts'),
+        :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
+      )
+      RemoteExecutionFeature.register(
+        :ansible_configure_cloud_connector,
+        N_('Configure Cloud Connector on given hosts'),
+        :description => N_('Configure Cloud Connector on given hosts'),
+        :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_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 = '6.0.0'
+  VERSION = '6.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible_core
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -182,6 +182,7 @@ files:
 - app/views/foreman_ansible/job_templates/run_command_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/run_playbook-ansible_default.erb
 - app/views/foreman_ansible/job_templates/service_action_-_ansible_default.erb
+- app/views/foreman_ansible/job_templates/service_action_-_enable_web_console.erb
 - app/views/ui_ansible_roles/index.json.rabl
 - app/views/ui_ansible_roles/main.json.rabl
 - app/views/ui_ansible_roles/show.json.rabl
@@ -347,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
@@ -356,41 +357,41 @@ test_files:
 - test/factories/ansible_roles.rb
 - test/factories/ansible_variables.rb
 - test/fixtures/insights_playbook.yaml
-- test/fixtures/sample_facts.json
 - test/fixtures/report.json
+- test/fixtures/sample_facts.json
+- test/functional/ansible_roles_controller_test.rb
+- test/functional/ansible_variables_controller_test.rb
+- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
+- test/functional/api/v2/ansible_variables_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
-- test/functional/api/v2/ansible_inventories_controller_test.rb
-- test/functional/api/v2/ansible_variables_controller_test.rb
-- test/functional/ansible_roles_controller_test.rb
-- test/functional/ansible_variables_controller_test.rb
-- test/functional/ui_ansible_roles_controller_test.rb
 - test/functional/hosts_controller_test.rb
+- test/functional/ui_ansible_roles_controller_test.rb
+- test/test_plugin_helper.rb
 - test/unit/actions/run_ansible_job_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
+- test/unit/ansible_role_test.rb
+- test/unit/ansible_variable_test.rb
 - test/unit/concerns/config_reports_extensions_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
 - test/unit/concerns/hostgroup_extensions_test.rb
 - test/unit/helpers/ansible_reports_helper_test.rb
+- test/unit/host_ansible_role_test.rb
+- test/unit/hostgroup_ansible_role_test.rb
 - test/unit/lib/foreman_ansible_core/command_creator_test.rb
 - test/unit/lib/foreman_ansible_core/ansible_runner_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_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
 - test/unit/services/api_roles_importer_test.rb
+- test/unit/services/fact_importer_test.rb
+- test/unit/services/fact_parser_test.rb
 - test/unit/services/fact_sparser_test.rb
 - test/unit/services/insights_plan_runner_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
-- test/unit/services/ansible_report_importer_test.rb
-- test/unit/services/fact_importer_test.rb
-- test/unit/services/fact_parser_test.rb
-- test/unit/services/ansible_variables_importer_test.rb
 - test/unit/services/inventory_creator_test.rb
-- test/unit/ansible_role_test.rb
-- test/unit/host_ansible_role_test.rb
-- test/unit/hostgroup_ansible_role_test.rb
-- test/unit/ansible_variable_test.rb
 - test/unit/ansible_provider_test.rb
-- test/test_plugin_helper.rb