foreman_ansible 2.2.4 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4f05964b165891e1b44e5158dcf7b2d5e77881e
-  data.tar.gz: c1629f35495a5617fa6a74a10fffadbde03564ea
+  metadata.gz: e462c3b9312bf42cb1f7a267edbe619aae3849dc
+  data.tar.gz: 1cd77d5a1ab0047c0b25108a995c73790f92e774
 SHA512:
-  metadata.gz: 3e2aae785f1b33486213458fce2c68d3c3a278e09545bf7ec77fb4e2e0b4345296b69f2623dd0c47cd2468e33be4ba0de1498fb7484e58f425836741ae849e5f
-  data.tar.gz: cc39abf1727a1eab156b1ce837cd3fe16642979c35cbbfe02d61e07edc9dc28d0cd57fa2822f2c8402804e04074a76afec60c45d32e481233d835325a3ae60b6
+  metadata.gz: e77318b028e35757faa9bc78b523edfba003bf15c4a687f1592c6d16e0191d1d2fa913da461e757f95118bc6bf0132a78f58381c1c10bcf9c2bd9ab94ee65da3
+  data.tar.gz: d381adc5b3aaa880a0e71da579bb2f7f063bd76e8542500de92ed53ccb06443974e168e31a5588cb51f351c96416805f47146c17c406c75d0f249996ea327d71

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

@@ -15,12 +15,11 @@ module ForemanAnsible
                     :only_explicit => true
 
       before_provision :play_ansible_roles
-      include ForemanAnsible::HasManyAnsibleRoles
       audit_associations :ansible_roles
 
       def inherited_ansible_roles
         return [] unless hostgroup
-        hostgroup.all_ansible_roles
+        hostgroup.inherited_and_own_ansible_roles
       end
 
       # This one should be fixed, disabled for the moment as we're
@@ -43,14 +42,20 @@ module ForemanAnsible
                     "#{e.message}")
       end
       # rubocop:enable Metrics/AbcSize
+
+      def all_ansible_roles
+        (ansible_roles + inherited_ansible_roles).uniq
+      end
     end
     # rubocop:enable Metrics/BlockLength
     # Class methods we may need to override or add
     module ClassMethods
-      def import_host(hostname, certname = nil, deprecated_proxy = nil)
-        host = super(hostname, certname, deprecated_proxy)
-        if IPAddress.valid?(hostname) && Nic::Interface.find_by(:ip => hostname)
-          host = Nic::Interface.find_by(:ip => hostname).host
+      def import_host(*args)
+        host = super(*args)
+        hostname = args[0]
+        if IPAddress.valid?(hostname) &&
+           (host_nic = Nic::Interface.find_by(:ip => hostname))
+          host = host_nic.host
         end
         host
       end

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

@@ -7,7 +7,6 @@ module ForemanAnsible
       has_many :hostgroup_ansible_roles, :foreign_key => :hostgroup_id
       has_many :ansible_roles, :through => :hostgroup_ansible_roles,
                                :dependent => :destroy
-      include ForemanAnsible::HasManyAnsibleRoles
       audit_associations :ansible_roles
 
       def inherited_ansible_roles
@@ -25,6 +24,13 @@ module ForemanAnsible
       def host_ansible_roles
         hosts.all.includes(:ansible_roles).flat_map(&:ansible_roles)
       end
+
+      # includes also roles of all assigned hosts, useful to determine if
+      # at least one host in this hostgroup has some ansible role assigned
+      # either directly or through hostgroup
+      def all_ansible_roles
+        (ansible_roles + inherited_ansible_roles + host_ansible_roles).uniq
+      end
     end
   end
 end

data/lib/foreman_ansible/version.rb

@@ -2,5 +2,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '2.2.4'.freeze
+  VERSION = '2.2.5'.freeze
 end

data/test/unit/concerns/host_managed_extensions_test.rb

@@ -11,6 +11,7 @@ class HostManagedExtensionsTest < ActiveSupport::TestCase
                                           :ansible_roles => [@role2])
     @hostgroup = FactoryBot.create(:hostgroup, :parent => @hostgroup_parent)
     @host = FactoryBot.build_stubbed(:host, :ansible_roles => [@role1])
+    @another_host = FactoryBot.build_stubbed(:host, :ansible_roles => [@role3])
   end
 
   describe '#all_ansible_roles' do

data/test/unit/concerns/hostgroup_extensions_test.rb

@@ -10,16 +10,19 @@ class HostgroupExtensionsTest < ActiveSupport::TestCase
     @hostgroup_parent = FactoryBot.create(:hostgroup,
                                           :ansible_roles => [@role2])
     @hostgroup = FactoryBot.create(:hostgroup, :ansible_roles => [@role1])
+    @host = FactoryBot.create(:host,
+                              :ansible_roles => [@role3],
+                              :hostgroup => @hostgroup)
   end
 
   describe '#all_ansible_roles' do
     test 'returns assigned roles without any parent hostgroup' do
-      @hostgroup.all_ansible_roles.must_equal [@role1]
+      @hostgroup.all_ansible_roles.must_equal [@role1, @role3]
     end
 
-    test 'returns assigned and inherited roles with a parent hostgroup' do
+    test 'returns assigned and inherited roles with from parent hostgroup' do
       @hostgroup.parent = @hostgroup_parent
-      @hostgroup.all_ansible_roles.must_equal [@role1, @role2]
+      @hostgroup.all_ansible_roles.must_equal [@role1, @role2, @role3]
     end
   end
 
@@ -33,4 +36,15 @@ class HostgroupExtensionsTest < ActiveSupport::TestCase
       @hostgroup.inherited_ansible_roles.must_equal [@role2]
     end
   end
+
+  describe '#inherited_and_own_ansible_roles' do
+    test 'returns only hostgroup roles' do
+      @hostgroup_parent.inherited_and_own_ansible_roles.must_equal [@role2]
+    end
+
+    test 'returns only hostgroup roles including inheritance' do
+      @hostgroup.parent = @hostgroup_parent
+      @hostgroup.inherited_and_own_ansible_roles.must_equal [@role2, @role1]
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.5
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -135,7 +135,6 @@ files:
 - app/lib/actions/foreman_ansible/helpers/play_roles_description.rb
 - app/lib/proxy_api/ansible.rb
 - app/models/ansible_role.rb
-- app/models/concerns/foreman_ansible/has_many_ansible_roles.rb
 - app/models/concerns/foreman_ansible/host_managed_extensions.rb
 - app/models/concerns/foreman_ansible/hostgroup_extensions.rb
 - app/models/foreman_ansible/ansible_provider.rb

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

@@ -1,15 +0,0 @@
-module ForemanAnsible
-  # Define common behaviors between models that have many Ansible roles,
-  # currently Host and Hostgroup. Takes care of inheritance, etc...
-  module HasManyAnsibleRoles
-    extend ActiveSupport::Concern
-
-    included do
-      def all_ansible_roles
-        result = (ansible_roles + inherited_ansible_roles).uniq
-        result += host_ansible_roles if is_a? Hostgroup
-        result
-      end
-    end
-  end
-end