smart_proxy_salt 2.1.5 → 2.1.6
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 +4 -4
- data/bin/foreman-node +6 -1
- data/etc/foreman.yaml.example +5 -5
- data/lib/smart_proxy_salt/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c7dc004f36b7961d8101ee986cfa040e698ea4d7
|
|
4
|
+
data.tar.gz: 1a72efead0f951b1bb8f15d496a4951a280ca093
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
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
|
-
|
|
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:
|
|
2
|
+
:proto: https
|
|
3
3
|
:host: foreman.example.com
|
|
4
|
-
:port:
|
|
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
|
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.
|
|
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-
|
|
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
|