smart_proxy_salt 2.1.8 → 2.1.9

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 3617d7030f84c637b456820c2ed126a46a0891f8
4
- data.tar.gz: e38b6cbe39839ac23e9b734fd1b72ee5baeb10fb
2
+ SHA256:
3
+ metadata.gz: 85ca85442234e6c70fe35cf796b48921c051f2ac11696ad79b475cf326e3415a
4
+ data.tar.gz: f7fe7ba6d9028def717e0e0f6250d2d50cac55c8512ed7481d9a58733cb754f2
5
5
  SHA512:
6
- metadata.gz: 5b4b844c9a4463aa77ca9769028fd5d32d9efa933c4ecc6cf90391ab437f78936a7882583f548bfa338c33dfd4731e27fba5f1d233e650521aaf3411888cf824
7
- data.tar.gz: 657c0199e6aea9a2fefdcc4847f2a7107ba4dd1fbf28c2e7413a4119a09c79680e69a5ed569e13f2e854a07096ba82bc8e8e69752ea5e3b1b9fbf26f47f57c45
6
+ metadata.gz: 68630d6978885cfbacc7651ea230b2596d915c85ff1373d0be8f4db2e3cb984479c2ddadeb1f43b604b769c154cfd77d7186247dbd8ac8f77d560f17edd2c12a
7
+ data.tar.gz: ae6a97eccbe59f9c33a0d49724ab3b58c09190752cfe39223a0afb0089631084148b9a5674198cefc3cfb96fb8370479dc8967385260aaacc31fed19f6ec74c3
data/bin/foreman-node CHANGED
@@ -72,7 +72,7 @@ import salt.runner
72
72
 
73
73
  if __name__ == '__main__':
74
74
  __opts__ = salt.config.master_config(
75
- os.environ.get('SALT_MASTER_CONFIG', '/etc/salt/minion'))
75
+ os.environ.get('SALT_MASTER_CONFIG', '/etc/salt/master'))
76
76
  runner = salt.runner.Runner(__opts__)
77
77
 
78
78
  stdout_bak = sys.stdout
@@ -72,13 +72,13 @@ module Proxy::Salt::CLI
72
72
 
73
73
  def key_reject(host)
74
74
  find_salt_binaries
75
- cmd = [@sudo, '-u', Proxy::Salt::Plugin.settings.salt_command_user, @salt_key, '--yes', '-r', escape_for_shell(host)]
75
+ cmd = [@sudo, '-u', Proxy::Salt::Plugin.settings.salt_command_user, @salt_key, '--include-accepted', '--yes', '-r', escape_for_shell(host)]
76
76
  shell_command(cmd)
77
77
  end
78
78
 
79
79
  def key_accept(host)
80
80
  find_salt_binaries
81
- cmd = [@sudo, '-u', Proxy::Salt::Plugin.settings.salt_command_user, @salt_key, '--yes', '-a', escape_for_shell(host)]
81
+ cmd = [@sudo, '-u', Proxy::Salt::Plugin.settings.salt_command_user, @salt_key, '--include-rejected', '--yes', '-a', escape_for_shell(host)]
82
82
  shell_command(cmd)
83
83
  end
84
84
 
@@ -1,5 +1,5 @@
1
1
  module Proxy
2
2
  module Salt
3
- VERSION = '2.1.8'
3
+ VERSION = '2.1.9'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smart_proxy_salt
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.8
4
+ version: 2.1.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Moll
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-03-29 00:00:00.000000000 Z
12
+ date: 2018-05-06 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: SaltStack Plug-In for Foreman's Smart Proxy
15
15
  email: foreman-dev@googlegroups.com
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
56
56
  version: '0'
57
57
  requirements: []
58
58
  rubyforge_project:
59
- rubygems_version: 2.5.2
59
+ rubygems_version: 2.7.6
60
60
  signing_key:
61
61
  specification_version: 4
62
62
  summary: SaltStack Plug-In for Foreman's Smart Proxy