foreman_ansible 7.1.2 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ded4963f8ef2ac710b82d4ae1a6a20dceed5fbb577059981fab73fd07b61ad6a
-  data.tar.gz: fd300c47edc4ce921b1a8500c183b3757fd3cf4acf8fb7d9377eafda98bd17b4
+  metadata.gz: df3c4d8c1514c442f1da8c0c6ef356482f5edb63ca14df0e39ef83818076f22b
+  data.tar.gz: 253b5ef0614bb34d78ad96b7312537b496b4850ea34d6ba7a960f9df34da5e02
 SHA512:
-  metadata.gz: b0717c5963bcabf982fdc647570e1a603dfb7794af517293bdd3f41d72e7158ad1ab8ad05930aa749f3ea8f79ab7f9ab20d3bd4de5568d12e79d25f8fdd83b0e
-  data.tar.gz: 9edde27d8e6503d55def1157329c5dd63195c0ca6d339694b5144c3578e435dbe0cb946f08efa13bd95e6ae24006b45abec0cd5099c56bf751d5c067b8cb9085
+  metadata.gz: b6f8201c41db492b56888c675cb460f88e5dae92aeb808487747783ba43031961a27f66eb2df975216385b8e003d2df645f4208f0a1f0d4bec44b0c02f878984
+  data.tar.gz: da19e080f0fa135ae2cb4757fae4a10a946989ecc953cf41eb774877b075bcfc68455707d4abc3a4265fdcb1421714572947bb14eefc709a8d825d6c23623987

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

@@ -46,7 +46,11 @@ module ForemanAnsible
             find_resource
             return unless @hostgroup
 
-            @ansible_roles = @hostgroup.all_ansible_roles
+            @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
+            ).uniq
           end
 
           api :POST, '/hostgroups/:id/assign_ansible_roles',

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

@@ -49,7 +49,9 @@ module ForemanAnsible
           def ansible_roles
             return unless @host
 
-            @ansible_roles = @host.all_ansible_roles
+            @inherited_ansible_roles = @host.inherited_ansible_roles
+            @directly_assigned_roles = @host.ansible_roles
+            @ansible_roles = (@directly_assigned_roles + @inherited_ansible_roles).uniq
           end
 
           api :POST, '/hosts/:id/assign_ansible_roles',

data/app/helpers/foreman_ansible/ansible_hostgroups_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module ForemanAnsible
+  module AnsibleHostgroupsHelper
+    def ansible_hostgroups_actions(hostgroup)
+      play_roles = if hostgroup.all_ansible_roles.empty?
+                     { action: (link_to _('Run all Ansible roles'), 'javascript:void(0);', disabled: true, title: 'No Roles assigned'), priority: 31 }
+                   else
+                     { action: display_link_if_authorized(_('Run all Ansible roles'), hash_for_play_roles_hostgroup_path(id: hostgroup), 'data-no-turbolink': true, title: _('Run all Ansible roles on hosts belonging to this host group')), priority: 31 }
+                   end
+
+      [play_roles] if User.current.can?(:create_job_invocations)
+    end
+  end
+end

data/app/helpers/foreman_ansible/ansible_reports_helper.rb

@@ -57,10 +57,6 @@ module ForemanAnsible
       _('No additional data')
     end
 
-    def ansible_report_origin_icon
-      'foreman_ansible/Ansible.png'
-    end
-
     def ansible_report_origin_partial
       'foreman_ansible/config_reports/ansible'
     end

data/app/helpers/foreman_ansible/hosts_helper.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module ForemanAnsible
+  module HostsHelper
+    def ansible_hosts_multiple_actions
+      return [] unless User.current.can?(:create_job_invocations) &&
+                       User.current.can?(:play_roles_on_host)
+
+      [{ action: [_('Run all Ansible roles'),
+                  multiple_play_roles_hosts_path,
+                  false], priority: 1000 }]
+    end
+
+    def ansible_roles_present?(host)
+      host.ansible_roles.present? ||
+        host.inherited_ansible_roles.present?
+    end
+  end
+end

data/app/services/foreman_ansible/variables_importer.rb

@@ -31,14 +31,12 @@ module ForemanAnsible
     end
 
     def import_variables(role_variables, new_roles)
-      detect_changes(
-        role_variables.map do |role_name, variables|
-          next if variables.blank?
-          role = import_new_role(role_name, new_roles)
-          next if role.blank?
-          initialize_variables(variables, role)
-        end.select(&:present?).flatten.compact
-      )
+      detect_changes(role_variables.map do |role_name, variables|
+        next if variables.blank?
+        role = import_new_role(role_name, new_roles)
+        next if role.blank?
+        initialize_variables(variables, role)
+      end.select(&:present?).flatten.compact)
     end
 
     def import_variables_roles(roles)
@@ -96,7 +94,9 @@ module ForemanAnsible
       persisted, changes[:new] = imported.partition { |var| var.id.present? }
       changed, _old = persisted.partition(&:changed?)
       _overriden, changes[:update] = changed.partition(&:override?)
-      changes[:obsolete] = AnsibleVariable.where.not(:id => persisted.pluck(:id), :imported => false)
+      changes[:obsolete] = AnsibleVariable.where.not(id: persisted.pluck(:id)).
+                           where.not(imported: false)
+
       changes
     end
 

data/app/views/api/v2/hostgroups/ansible_roles.json.rabl

@@ -2,4 +2,12 @@
 
 collection @ansible_roles
 
-attributes :id, :name, :created_at, :updated_at
+extends 'api/v2/ansible_roles/show'
+
+node :inherited do |role|
+  @inherited_ansible_roles.include?(role)
+end
+
+node :directly_assigned do |role|
+  @directly_assigned_roles.include?(role)
+end

data/app/views/api/v2/hosts/ansible_roles.json.rabl

@@ -2,4 +2,12 @@
 
 collection @ansible_roles
 
-attributes :id, :name, :created_at, :updated_at
+extends 'api/v2/ansible_roles/show'
+
+node :inherited do |role|
+  @inherited_ansible_roles.include?(role)
+end
+
+node :directly_assigned do |role|
+  @directly_assigned_roles.include?(role)
+end

data/config/routes.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  match '/ansible/hostgroups' => 'react#index', :via => [:get]
-  match '/ansible/hostgroups/*page' => 'react#index', :via => [:get]
-
   namespace :api, defaults: { format: 'json' } do
     scope '(:apiv)',
           :module => :v2,
@@ -113,4 +110,7 @@ Rails.application.routes.draw do
       end
     end
   end
+
+  match '/ansible/hostgroups' => 'react#index', :via => [:get]
+  match '/ansible/hostgroups/*page' => 'react#index', :via => [:get]
 end

data/db/migrate/20200421201839_update_ansible_inv_template_name.rb

@@ -1,9 +1,5 @@
 class UpdateAnsibleInvTemplateName < ActiveRecord::Migration[5.2]
   def up
-    Setting.where(:name => 'ansible_inventory_template').update_all(:default => 'Ansible - Ansible Inventory')
-  end
-  
-  def down
-    Setting.where(:name => 'ansible_inventory_template').update_all(:default => 'Ansible Inventory')
+    # Setting defaults are updated automatically now
   end
 end

data/lib/foreman_ansible/engine.rb

@@ -67,7 +67,6 @@ module ForemanAnsible
     config.to_prepare do
       ::Host::Managed.prepend ForemanAnsible::HostManagedExtensions
       ::Hostgroup.include ForemanAnsible::HostgroupExtensions
-      ::HostsHelper.include ForemanAnsible::HostsHelperExtensions
       ::HostsController.include ForemanAnsible::Concerns::HostsControllerExtensions
       ::Api::V2::HostsController.include ForemanAnsible::Api::V2::HostsControllerExtensions
       ::Api::V2::HostsController.include ForemanAnsible::Api::V2::HostsParamGroupExtensions

data/lib/foreman_ansible/register.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Foreman::Plugin.register :foreman_ansible do
-  requires_foreman '>= 3.3'
+  requires_foreman '>= 3.4'
 
   settings do
     category :ansible, N_('Ansible') do
@@ -187,7 +187,7 @@ Foreman::Plugin.register :foreman_ansible do
 
   register_global_js_file 'global'
 
-  extend_graphql_type :type => ::Types::Host do
+  extend_graphql_type :type => '::Types::Host' do
     field :all_ansible_roles, ::Types::InheritedAnsibleRole.connection_type, :null => true, :method => :present_all_ansible_roles
     field :own_ansible_roles, ::Types::AnsibleRole.connection_type, :null => true
     field :available_ansible_roles, ::Types::AnsibleRole.connection_type, :null => true
@@ -236,4 +236,12 @@ Foreman::Plugin.register :foreman_ansible do
     register_report_scanner ForemanAnsible::AnsibleReportScanner
     register_report_origin 'Ansible', 'ConfigReport'
   end
+
+  describe_host do
+    multiple_actions_provider :ansible_hosts_multiple_actions
+  end
+
+  describe_hostgroup do
+    hostgroup_actions_provider :ansible_hostgroups_actions
+  end
 end

data/lib/foreman_ansible/remote_execution.rb

@@ -48,12 +48,6 @@ module ForemanAnsible
         :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
 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 = '7.1.2'
+  VERSION = '9.0.0'
 end

data/locale/action_names.rb

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