smart_proxy_ansible 2.1.1 → 2.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 572320552523c1629bda9d963a16fd07d189f14a
4
- data.tar.gz: 92d4fee5cbafedd4fc52b0921ca4f470374837f1
3
+ metadata.gz: d9d9191afda919cc1c6d8ed95f374b6e6824075e
4
+ data.tar.gz: d8ba3c8dcd1322349adbeba3cb4a272120e47fb5
5
5
  SHA512:
6
- metadata.gz: f9faca4cd728399491dd3a8edba30dc214d710ed237d12c95e5abaed7a58eccdc35ad79a2c894b8eeea1fc1723b2b05ed857eef8add79c102a51e4de2a7cb571
7
- data.tar.gz: 3c908550293b98400efb727cd89e5f55537ff6b1616a364c78635dccb7fff8540a19845bba583547d3c637207192d91149a03dde215fa7df1334de8d897b70da
6
+ metadata.gz: 8a4d4039752a5b99984f3af42feb6b7525139134312451e91603bf61f18a2c268217d963ac1984aefaacbd9d276fd86f016dc9e599cafceb3d026dc787c2bb30
7
+ data.tar.gz: efe3fc55690b2379863cd67a8b474684a4a293e96908782e2ef2229662216967387a072d63763618bf52f9503ed945c8c89204351959bb7cce12c90500883969
@@ -37,8 +37,8 @@ module Proxy
37
37
  def extract_variables(role_name)
38
38
  variables = {}
39
39
  RolesReader.roles_path.split(':').each do |path|
40
- variables[role_name] = VariablesExtractor
41
- .extract_variables("#{path}/#{role_name}")
40
+ variables[role_name] ||= VariablesExtractor
41
+ .extract_variables("#{path}/#{role_name}")
42
42
  end
43
43
  variables
44
44
  end
@@ -9,6 +9,17 @@ module Proxy
9
9
 
10
10
  settings_file 'ansible.yml'
11
11
  plugin :ansible, Proxy::Ansible::VERSION
12
+
13
+ after_activation do
14
+ begin
15
+ require 'smart_proxy_dynflow_core'
16
+ require 'foreman_ansible_core'
17
+ ForemanAnsibleCore.initialize_settings(Proxy::Ansible::Plugin.settings.to_h)
18
+ rescue LoadError => _
19
+ # Dynflow core is not available in the proxy, will be handled
20
+ # by standalone Dynflow core
21
+ end
22
+ end
12
23
  end
13
24
  end
14
25
  end
@@ -2,6 +2,6 @@ module Proxy
2
2
  # Version, this allows the proxy and other plugins know
3
3
  # what version of the Ansible plugin is running
4
4
  module Ansible
5
- VERSION = '2.1.1'
5
+ VERSION = '2.1.2'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smart_proxy_ansible
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.1
4
+ version: 2.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Nečas
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2019-01-22 00:00:00.000000000 Z
12
+ date: 2019-03-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler