kitchen-salt 0.0.10 → 0.0.11
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 +10 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
MTE0OWRjYzJmYTk5MTY0NzU3ZGU4NGU2MDkxNGVlZjFiYTUxMGM3NA==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
ZDE2OGIyZjAzMWVmYWU4OGM0ZGZhNDM2OGQ2YTY3NmY5ZmY3NzEwMQ==
|
|
7
7
|
SHA512:
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
NjZiZjU5M2JiZGIxY2QzNjVmZDExYzdkMTMzNGIwZWNmYjA2MmEwZTJkYmQx
|
|
10
|
+
MGJmMTU2YWVhMDZhYzE2YzdmYmVhNDE3ODNhNzY0NTk1ZGMyMjZmMjhiZDNm
|
|
11
|
+
NDQ2MTNhYWIzMzVmNjhhODliODNiMDE4YTJmNmJkN2EwNWI3MmI=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
MGFhNWJiNTMwOTY3MjMwMDIxMzU2ZjUyOTRjNmVjYjNkZjRhYmM1Y2I4OTll
|
|
14
|
+
MzJjZmE3YjUyOGE2ZTRhNDM5NGZkNGRlMzMzZTAyYjBjYmEyM2QyNzFlN2E5
|
|
15
|
+
OTllMWJmMzY3YjRiZjJkNTVmNjE0MjBkNDY1ZWI5ODJlNzEyMzk=
|
data/lib/kitchen-salt/version.rb
CHANGED
|
@@ -28,6 +28,8 @@ module Kitchen
|
|
|
28
28
|
# @author Chris Lundquist (<chris.ludnquist@github.com>)
|
|
29
29
|
class SaltSolo < Base
|
|
30
30
|
|
|
31
|
+
default_config :salt_version, "latest"
|
|
32
|
+
|
|
31
33
|
# supported install methods: bootstrap|apt
|
|
32
34
|
default_config :salt_install, "bootstrap"
|
|
33
35
|
|
|
@@ -35,7 +37,6 @@ module Kitchen
|
|
|
35
37
|
default_config :salt_bootstrap_options, ""
|
|
36
38
|
|
|
37
39
|
# alternative method of installing salt
|
|
38
|
-
default_config :salt_version, "latest"
|
|
39
40
|
default_config :salt_apt_repo, "http://apt.mccartney.ie"
|
|
40
41
|
default_config :salt_apt_repo_key, "http://apt.mccartney.ie/KEY"
|
|
41
42
|
|
|
@@ -56,6 +57,14 @@ module Kitchen
|
|
|
56
57
|
|
|
57
58
|
def install_command
|
|
58
59
|
debug(diagnose())
|
|
60
|
+
|
|
61
|
+
# if salt_verison is set, bootstrap is being used & bootstrap_options is empty,
|
|
62
|
+
# set the bootstrap_options string to git install the requested version
|
|
63
|
+
if ((config[:salt_version] != 'latest') && (config[:salt_install] == 'bootstrap') && config[:salt_bootstrap_options].empty?)
|
|
64
|
+
debug("Using bootstrap git to install #{config[:salt_version]}")
|
|
65
|
+
config[:salt_bootstrap_options] = "-P git v#{config[:salt_version]}"
|
|
66
|
+
end
|
|
67
|
+
|
|
59
68
|
salt_install = config[:salt_install]
|
|
60
69
|
|
|
61
70
|
salt_url = config[:salt_bootstrap_url]
|