foreman_salt 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ee51989d82f34d76d55912ccd8703f57174338b
-  data.tar.gz: 5b031339533e12d2cdb1ebfe55a51866e6b65463
+  metadata.gz: d2936d97abe52cb693b707b70efe7202cc88e5d7
+  data.tar.gz: d89d2744669bf971479183f366704e7d358f0fe4
 SHA512:
-  metadata.gz: 118f8385c0bedde86944f5153bad4c0e71f0ce42087589bf58899544616a508f847b1899e6325702da26caa795b272415176dc03c68014172e765a9d2da1fa2c
-  data.tar.gz: 916ff3a5404117a014d6bbf859ff5b82c9664a5b3ba534ce9e2737b59e0be0c40e8439beb4fd9115cd4a0daf6c73526a5e3c20f56716be5ee4eee515bfe32fb9
+  metadata.gz: b7bce3bc44a5aade9c39f8fab76eb9d284f0aa14c518f2dde18e72c1b79939d52dfea1b1f98a5e7051c43ef4bd9732ee704a07b0caeb35dd28fd7cfd4ba05908
+  data.tar.gz: 2d89a9a3d209cd6bf6e0536a21e69ccbbf6ee1104f4e65d64aaa9e0c9f9c04a49ffc357759738c143391b656be4bda13b78398464f4c2113231677261b152799

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,8 +58,10 @@ module ForemanSalt
         false
       end
 
-      def inherited_attributes_with_salt
-        inherited_attributes_without_salt + %w(salt_proxy_id salt_environment_id)
+      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
       end
 
       def smart_proxy_ids_with_salt_proxy
@@ -103,3 +105,7 @@ module ForemanSalt
     end
   end
 end
+
+class ::Host::Managed::Jail < Safemode::Jail
+  allow :salt_environment
+end

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.pluck('fact_names.name')
+      @facts_to_create ||= facts.keys - db_facts.keys
     end
 
     def fact_names

data/lib/foreman_salt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-19 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -189,21 +189,21 @@ specification_version: 4
 summary: Foreman Plug-in for Salt
 test_files:
 - test/factories/foreman_salt_factories.rb
-- test/functional/api/v2/salt_autosign_controller_test.rb
+- test/unit/host_extensions_test.rb
+- test/unit/salt_keys_test.rb
+- test/unit/grains_importer_test.rb
+- test/unit/hostgroup_extensions_test.rb
+- test/unit/report_importer_test.rb
+- test/unit/salt_modules_test.rb
+- test/unit/highstate.json
+- test/unit/grains_centos.json
+- test/functional/minions_controller_test.rb
 - test/functional/api/v2/salt_environments_controller_test.rb
+- test/functional/api/v2/salt_autosign_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/integration/salt_environment_test.rb
 - test/integration/salt_module_test.rb
-- test/unit/grains_centos.json
-- test/unit/highstate.json
-- test/unit/salt_keys_test.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