kitchen-salt 0.0.26 → 0.0.27
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/lib/kitchen/provisioner/formula-fetch.sh +16 -6
- data/lib/kitchen/provisioner/salt_solo.rb +4 -2
- data/lib/kitchen-salt/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 88b37d106829f94550c409e6eebb9c1d745bf7ed
|
|
4
|
+
data.tar.gz: d305501da8d91fee412673540ee66f90f995c18e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7c68cbaf25d24cd854d022b68cade1cef34dd4d41d7fcd54df36dce4cacb076a168fdc5168259e50267095b3fd39aec56c8d8c426c444bebdfd64a5dec400285
|
|
7
|
+
data.tar.gz: a0f348d5b3343bf85d83a1989e08f9b422e5af006d00038bfd942a121603b4d2b8ae4a6ff300c7c6589d1db6e41c180202bae41508a5ac0fc97ee4f411a7f3a7
|
|
@@ -64,13 +64,23 @@ function linkFormulas() {
|
|
|
64
64
|
SALT_ROOT=$1
|
|
65
65
|
SALT_ENV=${2:-/usr/share/salt-formulas/env}
|
|
66
66
|
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
67
|
+
if [[ -e "$SALT_ENV" ]]; then
|
|
68
|
+
# form git, development versions
|
|
69
|
+
if [[ -e "$SALT_ENV/_formulas" ]]; then
|
|
70
|
+
GIT_FORMULA_LIST=$(find "$SALT_ENV"/_formulas -maxdepth 1 -mindepth 1 -type d)
|
|
71
|
+
for formula in $GIT_FORMULA_LIST
|
|
72
|
+
do
|
|
73
|
+
name=$(basename "$formula")
|
|
74
|
+
ln -fs "$formula/$name" "$SALT_ROOT/$name"
|
|
75
|
+
find "$formula" -maxdepth 1 -mindepth 1 -type d |grep -E "_(modules|states|grains|renderers|returners)" | xargs -I{} \
|
|
76
|
+
basename {}| xargs -I{} cp -rs "$formula"/{} "$SALT_ROOT"/
|
|
77
|
+
done
|
|
78
|
+
fi
|
|
70
79
|
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
80
|
+
# form pkgs
|
|
81
|
+
find "$SALT_ENV" -maxdepth 1 -mindepth 1 -path "*_formulas*" -prune -o -name "*" -type d -print0| xargs -I{} -0 -n1 basename --no-run-if-empty {} | xargs -I{} --no-run-if-empty \
|
|
82
|
+
ln -fs "$SALT_ENV"/{} "$SALT_ROOT"/{};
|
|
83
|
+
fi
|
|
74
84
|
|
|
75
85
|
}
|
|
76
86
|
|
|
@@ -38,7 +38,7 @@ module Kitchen
|
|
|
38
38
|
dry_run: false,
|
|
39
39
|
salt_version: 'latest',
|
|
40
40
|
salt_install: 'bootstrap',
|
|
41
|
-
salt_bootstrap_url: 'https://bootstrap.saltstack.
|
|
41
|
+
salt_bootstrap_url: 'https://bootstrap.saltstack.com',
|
|
42
42
|
salt_bootstrap_options: '',
|
|
43
43
|
salt_apt_repo: 'https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest',
|
|
44
44
|
salt_apt_repo_key: 'https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub',
|
|
@@ -128,9 +128,11 @@ module Kitchen
|
|
|
128
128
|
echo "Failed install ruby(-dev) using assets.sh from kitchen-salt"
|
|
129
129
|
echo "-----> Fallback to Chef Bootstrap script (for busser/serverspec ruby support)"
|
|
130
130
|
mkdir -p "#{omnibus_download_dir}"
|
|
131
|
-
if [ ! -x #{omnibus_download_dir}/install.sh ]
|
|
131
|
+
if [ ! -x #{omnibus_download_dir}/install.sh ]
|
|
132
|
+
then
|
|
132
133
|
#{sudo('sh')} #{omnibus_download_dir}/install.sh -d #{omnibus_download_dir}
|
|
133
134
|
fi;
|
|
135
|
+
fi
|
|
134
136
|
INSTALL
|
|
135
137
|
end
|
|
136
138
|
end
|
data/lib/kitchen-salt/version.rb
CHANGED
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.27
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Simon McCartney
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-06-
|
|
11
|
+
date: 2017-06-30 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: test-kitchen
|
|
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
104
104
|
version: '0'
|
|
105
105
|
requirements: []
|
|
106
106
|
rubyforge_project: "[none]"
|
|
107
|
-
rubygems_version: 2.
|
|
107
|
+
rubygems_version: 2.4.3
|
|
108
108
|
signing_key:
|
|
109
109
|
specification_version: 4
|
|
110
110
|
summary: salt provisioner for test-kitchen
|