smart_proxy_ansible 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 572320552523c1629bda9d963a16fd07d189f14a
-  data.tar.gz: 92d4fee5cbafedd4fc52b0921ca4f470374837f1
+  metadata.gz: d9d9191afda919cc1c6d8ed95f374b6e6824075e
+  data.tar.gz: d8ba3c8dcd1322349adbeba3cb4a272120e47fb5
 SHA512:
-  metadata.gz: f9faca4cd728399491dd3a8edba30dc214d710ed237d12c95e5abaed7a58eccdc35ad79a2c894b8eeea1fc1723b2b05ed857eef8add79c102a51e4de2a7cb571
-  data.tar.gz: 3c908550293b98400efb727cd89e5f55537ff6b1616a364c78635dccb7fff8540a19845bba583547d3c637207192d91149a03dde215fa7df1334de8d897b70da
+  metadata.gz: 8a4d4039752a5b99984f3af42feb6b7525139134312451e91603bf61f18a2c268217d963ac1984aefaacbd9d276fd86f016dc9e599cafceb3d026dc787c2bb30
+  data.tar.gz: efe3fc55690b2379863cd67a8b474684a4a293e96908782e2ef2229662216967387a072d63763618bf52f9503ed945c8c89204351959bb7cce12c90500883969

data/lib/smart_proxy_ansible/api.rb

@@ -37,8 +37,8 @@ module Proxy
       def extract_variables(role_name)
         variables = {}
         RolesReader.roles_path.split(':').each do |path|
-          variables[role_name] = VariablesExtractor
-                                 .extract_variables("#{path}/#{role_name}")
+          variables[role_name] ||= VariablesExtractor
+                                   .extract_variables("#{path}/#{role_name}")
         end
         variables
       end

data/lib/smart_proxy_ansible/plugin.rb

@@ -9,6 +9,17 @@ module Proxy
 
       settings_file 'ansible.yml'
       plugin :ansible, Proxy::Ansible::VERSION
+
+      after_activation do
+        begin
+          require 'smart_proxy_dynflow_core'
+          require 'foreman_ansible_core'
+          ForemanAnsibleCore.initialize_settings(Proxy::Ansible::Plugin.settings.to_h)
+        rescue LoadError => _
+          # Dynflow core is not available in the proxy, will be handled
+          # by standalone Dynflow core
+        end
+      end
     end
   end
 end

data/lib/smart_proxy_ansible/version.rb

@@ -2,6 +2,6 @@ module Proxy
   # Version, this allows the proxy and other plugins know
   # what version of the Ansible plugin is running
   module Ansible
-    VERSION = '2.1.1'
+    VERSION = '2.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_ansible
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Ivan Nečas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler