kitchen-salt 0.6.1 → 0.6.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kitchen-salt/version.rb +1 -1
- data/lib/kitchen/provisioner/salt_solo.rb +4 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 14b452c061def71dab27209b97ea09292f082dbcf2a0675966119cb4c1d5b55d
|
|
4
|
+
data.tar.gz: 9046425cc275bea4ad2e934a00c8c88819177b9e4cb7563483d3fff42bb3274c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9d9a1a32ce5d932128f7b7cefe1a3a2ee2e15a8c6eab2713104927934a1dccb433120e442ff808e95a1399d96afca6b1a23b2d0743a531bcdd3376d6c92f1ed3
|
|
7
|
+
data.tar.gz: 9aca290f83981ba24a6b834b3ca85a6e8d92737ed3295c2999cbc6b98170670c5392c114fe37af619ae93c2ac784ccea53b134388e96f9178f17605fe9f7a8d6
|
data/lib/kitchen-salt/version.rb
CHANGED
|
@@ -107,7 +107,8 @@ module Kitchen
|
|
|
107
107
|
end
|
|
108
108
|
|
|
109
109
|
def install_command
|
|
110
|
-
unless
|
|
110
|
+
return unless config[:salt_install]
|
|
111
|
+
unless not config[:salt_install] == 'pip' || config[:install_after_init_environment]
|
|
111
112
|
setup_salt
|
|
112
113
|
end
|
|
113
114
|
end
|
|
@@ -124,6 +125,7 @@ module Kitchen
|
|
|
124
125
|
#{config[:prepare_salt_environment]}
|
|
125
126
|
PREPARE
|
|
126
127
|
end
|
|
128
|
+
return cmd unless config[:salt_install]
|
|
127
129
|
if config[:salt_install] == 'pip' || config[:install_after_init_environment]
|
|
128
130
|
cmd << setup_salt
|
|
129
131
|
end
|
|
@@ -209,6 +211,7 @@ module Kitchen
|
|
|
209
211
|
end
|
|
210
212
|
|
|
211
213
|
def prepare_install
|
|
214
|
+
return unless config[:salt_install]
|
|
212
215
|
salt_version = config[:salt_version]
|
|
213
216
|
if config[:salt_install] == 'pip'
|
|
214
217
|
debug('Using pip to install')
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kitchen-salt
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.6.
|
|
4
|
+
version: 0.6.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- SaltStack Inc
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-04-
|
|
11
|
+
date: 2020-04-09 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: hashie
|