stemcell 0.0.9 → 0.0.10
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.
- data/lib/stemcell/templates/bootstrap.sh.erb +6 -4
- data/lib/stemcell/version.rb +1 -1
- metadata +1 -1
|
@@ -26,7 +26,7 @@ exec 2> /var/log/init.err
|
|
|
26
26
|
|
|
27
27
|
|
|
28
28
|
##
|
|
29
|
-
## settings
|
|
29
|
+
## settings
|
|
30
30
|
##
|
|
31
31
|
|
|
32
32
|
|
|
@@ -65,10 +65,12 @@ get_instance_id() {
|
|
|
65
65
|
|
|
66
66
|
|
|
67
67
|
install_chef() {
|
|
68
|
-
if ! which chef-solo > /dev/null ; then
|
|
68
|
+
if ! which chef-solo > /dev/null ; then
|
|
69
69
|
echo installing chef via omnibus...
|
|
70
70
|
curl -L --silent https://www.opscode.com/chef/install.sh | sudo bash -s -- -v 11.2.0 1>&2
|
|
71
|
-
|
|
71
|
+
# TODO(mkr): this is a hack to get chef-solo-search working
|
|
72
|
+
/opt/chef/embedded/bin/gem install --no-ri --no-rdoc treetop
|
|
73
|
+
else
|
|
72
74
|
echo chef is already installed
|
|
73
75
|
fi
|
|
74
76
|
}
|
|
@@ -78,7 +80,7 @@ update_repo() {
|
|
|
78
80
|
git_wrapper=/etc/chef/git_wrapper
|
|
79
81
|
local keyfile=/etc/chef/git_key
|
|
80
82
|
mkdir -p $(dirname $repo_dir)
|
|
81
|
-
if [ -d $repo_dir ]; then
|
|
83
|
+
if [ -d $repo_dir ]; then
|
|
82
84
|
echo updating source...
|
|
83
85
|
(cd $repo_dir && GIT_SSH=$git_wrapper git fetch && git reset --hard origin/$branch && git clean -fdx)
|
|
84
86
|
else
|
data/lib/stemcell/version.rb
CHANGED