smart_proxy_salt 2.1.5 → 2.1.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/bin/foreman-node +6 -1
  3. data/etc/foreman.yaml.example +5 -5
  4. data/lib/smart_proxy_salt/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e255d683c311800e1fb0f1b7c7b8a41c8ec7bdfd
4
- data.tar.gz: eacec2c23cb46cffb25c41a844fe4b50be2a5056
3
+ metadata.gz: c7dc004f36b7961d8101ee986cfa040e698ea4d7
4
+ data.tar.gz: 1a72efead0f951b1bb8f15d496a4951a280ca093
5
5
  SHA512:
6
- metadata.gz: 28524b9c4463caa662bf6492d77ba2f5eb3ee1fd7cd4b1bf2cf8b5c902d8d664fa6155334b8b4743ce7f508dfa68f23c87ca1d44d9f3d61557ed5897c8fb37a6
7
- data.tar.gz: 05f43fb0b863d48f28f537daa617053ff5427ce84d01c2c35810c5af9ac2e5f461a82282b7062a1081a4253fe481c738ff7bce0f8ca2d4a9ab97ecc1592b668a
6
+ metadata.gz: 51057ad26a27607f5cb9fd79f7b492d1583706e6a67f1210701e3775adecc6487728ae9cc6a579626ef16e2a626813a33a86930ff825893eea8bfae7f7e7e80f
7
+ data.tar.gz: 9a1468d8a95ea045cebeb772947e8e349fd8ae6772e08f3fd4acf3d495cdd5775c5f2756078d44694511c19c9a207d0d0efd5cae394409d3a76c3c99fe482fa2
data/bin/foreman-node CHANGED
@@ -91,7 +91,12 @@ EOF
91
91
  end
92
92
 
93
93
  grains = JSON.load(result)
94
- plainify(grains[minion]).flatten.inject(&:merge)
94
+
95
+ if grains
96
+ plainify(grains[minion]).flatten.inject(&:merge)
97
+ else
98
+ raise 'No grains received from Salt master'
99
+ end
95
100
  end
96
101
 
97
102
  def plainify(hash, prefix = nil)
data/etc/foreman.yaml.example CHANGED
@@ -1,10 +1,10 @@
1
1
  ---
2
- :proto: http
2
+ :proto: https
3
3
  :host: foreman.example.com
4
- :port: 3000
5
- :ssl_ca: ""
6
- :ssl_cert: ""
7
- :ssl_key: ""
4
+ :port: 443
5
+ :ssl_ca: "/var/lib/puppet/ssl/certs/ca.pem"
6
+ :ssl_cert: "/var/lib/puppet/ssl/private_keys/foreman.example.com.pem"
7
+ :ssl_key: "/var/lib/puppet/ssl/certs/foreman.example.com.pem"
8
8
  :timeout: 10
9
9
  :salt: /usr/bin/salt
10
10
  :upload_grains: true
data/lib/smart_proxy_salt/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Proxy
2
2
  module Salt
3
- VERSION = '2.1.5'
3
+ VERSION = '2.1.6'
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.5
4
+ version: 2.1.6
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: 2015-08-31 00:00:00.000000000 Z
12
+ date: 2015-10-25 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