foreman_ansible 7.1.8 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e7ff6676073d880f0e1104159ece7cf319117e0137add3d039165d0050c7841
-  data.tar.gz: 548ccdf064118379d4de2dd463ee4596fa2cc95bab13349ae3a0dcb733d611fa
+  metadata.gz: 47b85dc5fe69b87ea05703f75380a2387deb64674755903ec03c3cb55dcc3bdb
+  data.tar.gz: ece7521c8b3f6da727abd6abad8be7384701a1598f6601dc5baf0b1f579931df
 SHA512:
-  metadata.gz: 4d820c8d1184bf52c7acde87d2b0cc64d06b61330ec562b181949deb69b861e3bcc32295d6319d6f8c77d2226b82cd2370d078fa7a9820f7a75dafefd022b5fa
-  data.tar.gz: d7d1b851ee5c4f72f331cfcb4af9430c8c0ba126572d8076ca7d16041ece7d241551b68fd1ad7f96a9c0fd8fbafc353c3d71b61e96f6327de3fe748a77b4705c
+  metadata.gz: f72ecf4fc7949815787bd4b93c1da3ee7df5baf2c2266950ddc6bd01b701ae38559896ae45b11995fa3574c84f041e01d7caf41ba1e18ba4b9c0c2cea397b752
+  data.tar.gz: cee830b49ad5443db42d34e6e0910e0783b2d116f91b02745a8556e184b4e66535c3620b4e9c15b4329a35286d117df51a0bba3e7d7ae818ab1016a63636e61c

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_reports_helper.rb

@@ -57,6 +57,10 @@ 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/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

@@ -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,8 @@ 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
 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.8'
+  VERSION = '8.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")