kitchen-salt 0.0.18 → 0.0.19
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/kitchen-salt/version.rb +1 -1
- data/lib/kitchen/provisioner/salt_solo.rb +11 -7
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MzBmNWJhY2U4OWMwMDliZTg4MTEwYjBmM2FhY2QyYTdkZjBiYjJmNg==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZjM1MDFiYTE2MzE4Y2ZiYzkwOTFhZTQwYjg0ZDgyNjMzYzM0YjE2NA==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MjIwMGI4MTI2MmRkNjNlODZlN2ZkNDlkNjVjNjdhODg5MGNkOTI3ZDI0Yjcw
|
10
|
+
NDE3YzljYTc5YjY4OWVkYWQ4MDRhNmExYjVhZjAwYTFmNmNjNzk5ZGU1ODIw
|
11
|
+
NTI0ZWRmNzBkZTNjM2M4ZWIzZDkzZGIwNDY0ZTIwM2ViYzhjYTY=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NzRkMzYxNzYzODU1NDRmZmU4MzhiOWYyYjE0NTZmNGExNTMyNWQ3Y2RjODQ5
|
14
|
+
MzI1ZGE3ZTA4MjAzZjFiZjc0MzI2NDQwOTVjMzUxYjk1Y2UxZjI2YTc3NTVj
|
15
|
+
Yjk0OGFiODkxOTFmY2M5MjdkNmYyODdiYjNmZDNmOGY3ZjdkMzM=
|
data/lib/kitchen-salt/version.rb
CHANGED
@@ -56,6 +56,7 @@ module Kitchen
|
|
56
56
|
default_config :salt_copy_filter, []
|
57
57
|
default_config :is_file_root, false
|
58
58
|
|
59
|
+
default_config :dependancies, []
|
59
60
|
|
60
61
|
# salt-call version that supports the undocumented --retcode-passthrough command
|
61
62
|
RETCODE_VERSION = '0.17.5'
|
@@ -154,7 +155,11 @@ module Kitchen
|
|
154
155
|
if config[:state_collection] || config[:is_file_root]
|
155
156
|
prepare_state_collection
|
156
157
|
else
|
157
|
-
prepare_formula
|
158
|
+
prepare_formula config[:kitchen_root], config[:formula]
|
159
|
+
|
160
|
+
config[:dependancies].each do |formula|
|
161
|
+
prepare_formula formula[:path], formula[:name]
|
162
|
+
end
|
158
163
|
end
|
159
164
|
end
|
160
165
|
|
@@ -348,18 +353,17 @@ module Kitchen
|
|
348
353
|
end
|
349
354
|
end
|
350
355
|
|
351
|
-
def prepare_formula
|
352
|
-
info("Preparing formula")
|
356
|
+
def prepare_formula(path, formula)
|
357
|
+
info("Preparing formula: #{formula} from #{path}")
|
353
358
|
debug("Using config #{config}")
|
354
359
|
|
355
|
-
formula_dir = File.join(sandbox_path, config[:salt_file_root],
|
360
|
+
formula_dir = File.join(sandbox_path, config[:salt_file_root], formula)
|
356
361
|
FileUtils.mkdir_p(formula_dir)
|
357
|
-
|
358
|
-
cp_r_with_filter(File.join(config[:kitchen_root], config[:formula]), formula_dir, config[:salt_copy_filter])
|
362
|
+
cp_r_with_filter(File.join(path, formula), formula_dir, config[:salt_copy_filter])
|
359
363
|
|
360
364
|
# copy across the _modules etc directories for python implementation
|
361
365
|
['_modules', '_states', '_grains', '_renderers', '_returners'].each do |extrapath|
|
362
|
-
src = File.join(
|
366
|
+
src = File.join(path, extrapath)
|
363
367
|
|
364
368
|
if (File.directory?(src))
|
365
369
|
debug("prepare_formula: #{src} exists, copying..")
|
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.0.
|
4
|
+
version: 0.0.19
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Simon McCartney
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-07-16 00:00:00.000000000 Z
|
12
12
|
dependencies: []
|
13
13
|
description: salt provisioner for test-kitchen
|
14
14
|
email:
|