kitchen-salt 0.0.22 → 0.0.23
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 +18 -2
- 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: 4af1ecd3dd3d7e2e414f3fd555c10041f2bb2376
|
4
|
+
data.tar.gz: cc9bcf0c49b3d7ade20601f4801864f1a66a867b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ce92dd6efc00856b7f10f98a31878c83d3e1f7fb3b7f0331bccbec987118a62e57e307eabbe853f1b161eb02664767fdea1e9fdf0b5fe2e054d11681713488c1
|
7
|
+
data.tar.gz: fff97311e5ade612ee4f1570c4cd3bff9a04ef8cbd1467fe751069116c636f1b8b2b61f492a9fcc857879212f6a95d78a93d1bb2f6f27f0a650f392f8e9620d9
|
data/lib/kitchen-salt/version.rb
CHANGED
@@ -41,6 +41,7 @@ module Kitchen
|
|
41
41
|
# alternative method of installing salt
|
42
42
|
default_config :salt_apt_repo, "http://apt.mccartney.ie"
|
43
43
|
default_config :salt_apt_repo_key, "http://apt.mccartney.ie/KEY"
|
44
|
+
default_config :salt_ppa, "ppa:saltstack/salt"
|
44
45
|
|
45
46
|
default_config :chef_bootstrap_url, "https://www.getchef.com/chef/install.sh"
|
46
47
|
|
@@ -82,6 +83,7 @@ module Kitchen
|
|
82
83
|
salt_version = config[:salt_version]
|
83
84
|
salt_apt_repo = config[:salt_apt_repo]
|
84
85
|
salt_apt_repo_key = config[:salt_apt_repo_key]
|
86
|
+
salt_ppa = config[:salt_ppa]
|
85
87
|
|
86
88
|
omnibus_download_dir = config[:omnibus_cachier] ? "/tmp/vagrant-cache/omnibus_chef" : "/tmp"
|
87
89
|
|
@@ -101,11 +103,22 @@ module Kitchen
|
|
101
103
|
then
|
102
104
|
. /etc/lsb-release
|
103
105
|
|
106
|
+
echo "-----> Configuring apt repo for salt #{salt_version}"
|
104
107
|
echo "deb #{salt_apt_repo}/salt-#{salt_version} ${DISTRIB_CODENAME} main" | #{sudo('tee')} /etc/apt/sources.list.d/salt-#{salt_version}.list
|
105
108
|
|
106
109
|
do_download #{salt_apt_repo_key} /tmp/repo.key
|
107
110
|
#{sudo('apt-key')} add /tmp/repo.key
|
108
111
|
|
112
|
+
#{sudo('apt-get')} update
|
113
|
+
sleep 10
|
114
|
+
echo "-----> Installing salt-minion (#{salt_version})"
|
115
|
+
#{sudo('apt-get')} install -y python-support
|
116
|
+
#{sudo('apt-get')} install -y salt-minion
|
117
|
+
#{sudo('apt-get')} install -y salt-common
|
118
|
+
#{sudo('apt-get')} install -y salt-minion
|
119
|
+
elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "ppa" ]
|
120
|
+
then
|
121
|
+
#{sudo('apt-add-repository')} -y #{salt_ppa}
|
109
122
|
#{sudo('apt-get')} update
|
110
123
|
#{sudo('apt-get')} install -y salt-minion
|
111
124
|
fi
|
@@ -122,6 +135,7 @@ module Kitchen
|
|
122
135
|
echo "salt_version = #{salt_version}"
|
123
136
|
echo "salt_apt_repo = #{salt_apt_repo}"
|
124
137
|
echo "salt_apt_repo_key = #{salt_apt_repo_key}"
|
138
|
+
echo "salt_ppa = #{salt_ppa}"
|
125
139
|
exit 2
|
126
140
|
elif [ "${SALT_VERSION}" = "#{salt_version}" -o "#{salt_version}" = "latest" ]
|
127
141
|
then
|
@@ -136,7 +150,7 @@ module Kitchen
|
|
136
150
|
|
137
151
|
if [ ! -d "/opt/chef" ]
|
138
152
|
then
|
139
|
-
echo "-----> Installing Chef Omnibus"
|
153
|
+
echo "-----> Installing Chef Omnibus (for busser/serverspec ruby support)"
|
140
154
|
mkdir -p #{omnibus_download_dir}
|
141
155
|
if [ ! -x #{omnibus_download_dir}/install.sh ]
|
142
156
|
then
|
@@ -198,7 +212,9 @@ module Kitchen
|
|
198
212
|
cmd = sudo("salt-call --config-dir=#{File.join(config[:root_path], config[:salt_config])} --local state.highstate")
|
199
213
|
end
|
200
214
|
|
201
|
-
|
215
|
+
if config[:log_level]
|
216
|
+
cmd << " --log-level=#{config[:log_level]}"
|
217
|
+
end
|
202
218
|
|
203
219
|
# config[:salt_version] can be 'latest' or 'x.y.z', 'YYYY.M.x' etc
|
204
220
|
# error return codes are a mess in salt:
|
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.23
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Simon McCartney
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2016-04-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: test-kitchen
|