foreman_salt 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6086715f9091869bb9b9e4bf8ce55b07737200f
-  data.tar.gz: d1404318a8da0127688638755d3247a1a0b23964
+  metadata.gz: 2ee51989d82f34d76d55912ccd8703f57174338b
+  data.tar.gz: 5b031339533e12d2cdb1ebfe55a51866e6b65463
 SHA512:
-  metadata.gz: 6f1f0df003e6cb6566e9836ed3161b6c27ef55069b99eb50721c068fa63f6a7e3b45d8617be3ad424454aeeac05485157ae11227c31cf86e18cdf49e6fe21cba
-  data.tar.gz: fe7dc9289fc0f93d234b24e050b60adba1fb215051b9ffee8e7be6cd8ba15949d185991ebd07ac99fb4be4324505f7b77ec11d9a11878e926e2bb64470c9a78b
+  metadata.gz: 118f8385c0bedde86944f5153bad4c0e71f0ce42087589bf58899544616a508f847b1899e6325702da26caa795b272415176dc03c68014172e765a9d2da1fa2c
+  data.tar.gz: 916ff3a5404117a014d6bbf859ff5b82c9664a5b3ba534ce9e2737b59e0be0c40e8439beb4fd9115cd4a0daf6c73526a5e3c20f56716be5ee4eee515bfe32fb9

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

@@ -11,8 +11,8 @@ module ForemanSalt
         belongs_to :salt_environment, :class_name => 'ForemanSalt::SaltEnvironment'
 
         alias_method_chain :params, :salt_proxy
-        alias_method_chain :set_hostgroup_defaults, :salt_proxy
         alias_method_chain :smart_proxy_ids, :salt_proxy
+        alias_method_chain :inherited_attributes, :salt
         alias_method_chain :configuration?, :salt
 
         scoped_search :in => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
@@ -58,10 +58,8 @@ module ForemanSalt
         false
       end
 
-      def set_hostgroup_defaults_with_salt_proxy
-        return unless hostgroup
-        assign_hostgroup_attributes(%w(salt_proxy_id salt_environment_id))
-        set_hostgroup_defaults_without_salt_proxy
+      def inherited_attributes_with_salt
+        inherited_attributes_without_salt + %w(salt_proxy_id salt_environment_id)
       end
 
       def smart_proxy_ids_with_salt_proxy

data/app/services/foreman_salt/fact_importer.rb

@@ -53,7 +53,7 @@ module ForemanSalt
     end
 
     def facts_to_create
-      @facts_to_create ||= facts.keys - db_facts.keys
+      @facts_to_create ||= facts.keys - db_facts.pluck('fact_names.name')
     end
 
     def fact_names

data/db/migrate/20161103104146_add_index_to_join_tables.rb

@@ -0,0 +1,8 @@
+class AddIndexToJoinTables < ActiveRecord::Migration
+  def change
+    add_index :host_salt_modules, :host_id
+    add_index :host_salt_modules, :salt_module_id
+    add_index :hostgroup_salt_modules, :hostgroup_id
+    add_index :hostgroup_salt_modules, :salt_module_id
+  end
+end

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '7.0.0'
+  VERSION = '7.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2016-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -136,6 +136,7 @@ files:
 - db/migrate/20150411003302_add_environments_to_modules.rb
 - db/migrate/20150509094409_rename_join_tables.rb
 - db/migrate/20150509101505_add_primary_keys.rb
+- db/migrate/20161103104146_add_index_to_join_tables.rb
 - db/seeds.d/75-salt_seeds.rb
 - lib/foreman_salt.rb
 - lib/foreman_salt/engine.rb
@@ -187,22 +188,22 @@ signing_key:
 specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
-- test/integration/salt_module_test.rb
-- test/integration/salt_environment_test.rb
+- test/factories/foreman_salt_factories.rb
+- test/functional/api/v2/salt_autosign_controller_test.rb
+- test/functional/api/v2/salt_environments_controller_test.rb
+- test/functional/api/v2/salt_keys_controller_test.rb
+- test/functional/api/v2/salt_states_controller_test.rb
+- test/functional/minions_controller_test.rb
 - test/integration/salt_autosign_test.rb
+- test/integration/salt_environment_test.rb
 - test/integration/salt_keys_test.rb
-- test/test_plugin_helper.rb
-- test/unit/grains_importer_test.rb
+- test/integration/salt_module_test.rb
 - test/unit/grains_centos.json
-- test/unit/host_extensions_test.rb
-- test/unit/report_importer_test.rb
-- test/unit/hostgroup_extensions_test.rb
-- test/unit/salt_modules_test.rb
 - test/unit/highstate.json
 - test/unit/salt_keys_test.rb
-- test/functional/minions_controller_test.rb
-- test/functional/api/v2/salt_autosign_controller_test.rb
-- test/functional/api/v2/salt_states_controller_test.rb
-- test/functional/api/v2/salt_keys_controller_test.rb
-- test/functional/api/v2/salt_environments_controller_test.rb
-- test/factories/foreman_salt_factories.rb
+- test/unit/salt_modules_test.rb
+- test/unit/hostgroup_extensions_test.rb
+- test/unit/report_importer_test.rb
+- test/unit/grains_importer_test.rb
+- test/unit/host_extensions_test.rb
+- test/test_plugin_helper.rb