stemcell 0.6.0 → 0.6.1

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.
Files changed (9) hide show
  1. data/Gemfile.lock +9 -9
  2. data/README.md +1 -1
  3. data/lib/stemcell/launcher.rb +2 -0
  4. data/lib/stemcell/metadata_source.rb +2 -0
  5. data/lib/stemcell/option_parser.rb +12 -0
  6. data/lib/stemcell/templates/bootstrap.sh.erb +15 -10
  7. data/lib/stemcell/version.rb +1 -1
  8. metadata +21 -5
  9. checksums.yaml +0 -15
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- stemcell (0.5.0)
4
+ stemcell (0.6.1)
5
5
  aws-creds (~> 0.2.2)
6
6
  aws-sdk (~> 1.9)
7
7
  chef (~> 11.4.0)
@@ -15,7 +15,7 @@ GEM
15
15
  specs:
16
16
  aws-creds (0.2.2)
17
17
  trollop (~> 2.0)
18
- aws-sdk (1.21.0)
18
+ aws-sdk (1.26.0)
19
19
  json (~> 1.4)
20
20
  nokogiri (>= 1.4.4, < 1.6.0)
21
21
  uuidtools (~> 2.1)
@@ -36,16 +36,16 @@ GEM
36
36
  colored (1.2)
37
37
  diff-lcs (1.2.5)
38
38
  erubis (2.7.0)
39
- highline (1.6.19)
39
+ highline (1.6.20)
40
40
  ipaddress (0.8.0)
41
41
  json (1.7.7)
42
- mime-types (1.23)
42
+ mime-types (2.0)
43
43
  mixlib-authentication (1.3.0)
44
44
  mixlib-log
45
45
  mixlib-cli (1.3.0)
46
- mixlib-config (1.1.2)
46
+ mixlib-config (2.0.0)
47
47
  mixlib-log (1.6.0)
48
- mixlib-shellout (1.1.0)
48
+ mixlib-shellout (1.2.0)
49
49
  multi_json (1.8.2)
50
50
  net-ssh (2.7.0)
51
51
  net-ssh-gateway (1.2.0)
@@ -53,14 +53,14 @@ GEM
53
53
  net-ssh-multi (1.1)
54
54
  net-ssh (>= 2.1.4)
55
55
  net-ssh-gateway (>= 0.99.0)
56
- nokogiri (1.5.9)
57
- ohai (6.16.0)
56
+ nokogiri (1.5.10)
57
+ ohai (6.20.0)
58
58
  ipaddress
59
59
  mixlib-cli
60
60
  mixlib-config
61
61
  mixlib-log
62
62
  mixlib-shellout
63
- systemu
63
+ systemu (~> 2.5.2)
64
64
  yajl-ruby
65
65
  rest-client (1.6.7)
66
66
  mime-types (>= 1.16)
data/README.md CHANGED
@@ -72,7 +72,7 @@ $ stemcell --help
72
72
  ### Watching install:
73
73
 
74
74
  ```bash
75
- $ ssh ubuntu@$IP 'tail -f /var/log/init*'
75
+ $ stemcell $your_chef_role --tail
76
76
  ```
77
77
 
78
78
  ### Terminating:
data/lib/stemcell/launcher.rb CHANGED
@@ -30,6 +30,8 @@ module Stemcell
30
30
  ]
31
31
 
32
32
  LAUNCH_PARAMETERS = [
33
+ 'chef_package_source',
34
+ 'chef_version',
33
35
  'chef_role',
34
36
  'chef_environment',
35
37
  'chef_data_bag_secret',
data/lib/stemcell/metadata_source.rb CHANGED
@@ -20,6 +20,8 @@ module Stemcell
20
20
  'count' => 1,
21
21
  'instance_hostname' => '',
22
22
  'instance_domain_name' => '',
23
+ 'chef_package_source' => 'http://www.opscode.com/chef/download?p=${platform}&pv=${platform_version}&m=${arch}&v=${chef_version}&prerelease=false',
24
+ 'chef_version' => '11.4.0',
23
25
  }
24
26
 
25
27
  def initialize(chef_root, config_filename=DEFAULT_CONFIG_FILENAME)
data/lib/stemcell/option_parser.rb CHANGED
@@ -124,6 +124,18 @@ module Stemcell
124
124
  :type => String,
125
125
  :env => 'CHEF_ROLE'
126
126
  },
127
+ {
128
+ :name => 'chef_version',
129
+ :desc => "the chef version we will bootstrap on the box (defaults to 11.4.0)",
130
+ :type => String,
131
+ :env => 'CHEF_VERSION'
132
+ },
133
+ {
134
+ :name => 'chef_package_source',
135
+ :desc => "source of chef packages (defaults to https://opscode-omnibus-packages.s3.amazonaws.com)",
136
+ :type => String,
137
+ :env => 'CHEF_PACKAGE_SOURCE'
138
+ },
127
139
  {
128
140
  :name => 'chef_environment',
129
141
  :desc => "chef environment in which this instance will run",
data/lib/stemcell/templates/bootstrap.sh.erb CHANGED
@@ -1,4 +1,4 @@
1
- #!/bin/bash -ex
1
+ #!/bin/bash -e
2
2
  #
3
3
  # This script will bootstrap and run chef
4
4
  #
@@ -57,8 +57,6 @@ echo $$ > ${PIDFILE}
57
57
  ## settings
58
58
  ##
59
59
 
60
-
61
- chef_version=11.4.0
62
60
  chef_dir=/etc/chef
63
61
  converge=/usr/local/bin/first_converge
64
62
  role=<%= opts['chef_role'] %>
@@ -112,14 +110,21 @@ set_hostname() {
112
110
  }
113
111
 
114
112
  install_chef() {
115
- if ! which chef-solo > /dev/null ; then
116
- echo installing chef via omnibus...
117
- curl -L --silent https://www.opscode.com/chef/install.sh | sudo bash -s -- -v $chef_version 1>&2
118
- else
119
- echo chef is already installed
120
- fi
121
- }
113
+ chef_version=<%= opts['chef_version'] %>
114
+ platform=`lsb_release -s -i | tr '[:upper:]' '[:lower:]'`
115
+ platform_version=`lsb_release -s -r`
116
+ arch=`uname -m`
117
+ package_url="<%= opts['chef_package_source'] %>"
122
118
 
119
+ package_local="/tmp/chef_${chef_version}.deb"
120
+ echo "Downloading chef from $package_url"
121
+ wget $package_url -O $package_local
122
+
123
+ echo "Installing chef $chef_version"
124
+ dpkg -i $package_local
125
+
126
+ rm $package_local
127
+ }
123
128
 
124
129
  update_repo() {
125
130
  echo -e "$git_key" > $keyfile
data/lib/stemcell/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Stemcell
2
- VERSION = "0.6.0"
2
+ VERSION = "0.6.1"
3
3
  end
metadata CHANGED
@@ -1,7 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: stemcell
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.0
4
+ version: 0.6.1
5
+ prerelease:
5
6
  platform: ruby
6
7
  authors:
7
8
  - Martin Rhoads
@@ -11,11 +12,12 @@ authors:
11
12
  autorequire:
12
13
  bindir: bin
13
14
  cert_chain: []
14
- date: 2013-11-12 00:00:00.000000000 Z
15
+ date: 2013-11-19 00:00:00.000000000 Z
15
16
  dependencies:
16
17
  - !ruby/object:Gem::Dependency
17
18
  name: aws-sdk
18
19
  requirement: !ruby/object:Gem::Requirement
20
+ none: false
19
21
  requirements:
20
22
  - - ~>
21
23
  - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
23
25
  type: :runtime
24
26
  prerelease: false
25
27
  version_requirements: !ruby/object:Gem::Requirement
28
+ none: false
26
29
  requirements:
27
30
  - - ~>
28
31
  - !ruby/object:Gem::Version
@@ -30,6 +33,7 @@ dependencies:
30
33
  - !ruby/object:Gem::Dependency
31
34
  name: net-ssh
32
35
  requirement: !ruby/object:Gem::Requirement
36
+ none: false
33
37
  requirements:
34
38
  - - ~>
35
39
  - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
37
41
  type: :runtime
38
42
  prerelease: false
39
43
  version_requirements: !ruby/object:Gem::Requirement
44
+ none: false
40
45
  requirements:
41
46
  - - ~>
42
47
  - !ruby/object:Gem::Version
@@ -44,6 +49,7 @@ dependencies:
44
49
  - !ruby/object:Gem::Dependency
45
50
  name: chef
46
51
  requirement: !ruby/object:Gem::Requirement
52
+ none: false
47
53
  requirements:
48
54
  - - ~>
49
55
  - !ruby/object:Gem::Version
@@ -51,6 +57,7 @@ dependencies:
51
57
  type: :runtime
52
58
  prerelease: false
53
59
  version_requirements: !ruby/object:Gem::Requirement
60
+ none: false
54
61
  requirements:
55
62
  - - ~>
56
63
  - !ruby/object:Gem::Version
@@ -58,6 +65,7 @@ dependencies:
58
65
  - !ruby/object:Gem::Dependency
59
66
  name: trollop
60
67
  requirement: !ruby/object:Gem::Requirement
68
+ none: false
61
69
  requirements:
62
70
  - - ~>
63
71
  - !ruby/object:Gem::Version
@@ -65,6 +73,7 @@ dependencies:
65
73
  type: :runtime
66
74
  prerelease: false
67
75
  version_requirements: !ruby/object:Gem::Requirement
76
+ none: false
68
77
  requirements:
69
78
  - - ~>
70
79
  - !ruby/object:Gem::Version
@@ -72,6 +81,7 @@ dependencies:
72
81
  - !ruby/object:Gem::Dependency
73
82
  name: aws-creds
74
83
  requirement: !ruby/object:Gem::Requirement
84
+ none: false
75
85
  requirements:
76
86
  - - ~>
77
87
  - !ruby/object:Gem::Version
@@ -79,6 +89,7 @@ dependencies:
79
89
  type: :runtime
80
90
  prerelease: false
81
91
  version_requirements: !ruby/object:Gem::Requirement
92
+ none: false
82
93
  requirements:
83
94
  - - ~>
84
95
  - !ruby/object:Gem::Version
@@ -86,6 +97,7 @@ dependencies:
86
97
  - !ruby/object:Gem::Dependency
87
98
  name: colored
88
99
  requirement: !ruby/object:Gem::Requirement
100
+ none: false
89
101
  requirements:
90
102
  - - ~>
91
103
  - !ruby/object:Gem::Version
@@ -93,6 +105,7 @@ dependencies:
93
105
  type: :runtime
94
106
  prerelease: false
95
107
  version_requirements: !ruby/object:Gem::Requirement
108
+ none: false
96
109
  requirements:
97
110
  - - ~>
98
111
  - !ruby/object:Gem::Version
@@ -100,6 +113,7 @@ dependencies:
100
113
  - !ruby/object:Gem::Dependency
101
114
  name: json
102
115
  requirement: !ruby/object:Gem::Requirement
116
+ none: false
103
117
  requirements:
104
118
  - - ~>
105
119
  - !ruby/object:Gem::Version
@@ -107,6 +121,7 @@ dependencies:
107
121
  type: :runtime
108
122
  prerelease: false
109
123
  version_requirements: !ruby/object:Gem::Requirement
124
+ none: false
110
125
  requirements:
111
126
  - - ~>
112
127
  - !ruby/object:Gem::Version
@@ -172,26 +187,27 @@ files:
172
187
  - stemcell.gemspec
173
188
  homepage: https://github.com/airbnb/stemcell
174
189
  licenses: []
175
- metadata: {}
176
190
  post_install_message:
177
191
  rdoc_options: []
178
192
  require_paths:
179
193
  - lib
180
194
  required_ruby_version: !ruby/object:Gem::Requirement
195
+ none: false
181
196
  requirements:
182
197
  - - ! '>='
183
198
  - !ruby/object:Gem::Version
184
199
  version: '0'
185
200
  required_rubygems_version: !ruby/object:Gem::Requirement
201
+ none: false
186
202
  requirements:
187
203
  - - ! '>='
188
204
  - !ruby/object:Gem::Version
189
205
  version: '0'
190
206
  requirements: []
191
207
  rubyforge_project:
192
- rubygems_version: 2.1.9
208
+ rubygems_version: 1.8.23
193
209
  signing_key:
194
- specification_version: 4
210
+ specification_version: 3
195
211
  summary: no summary
196
212
  test_files:
197
213
  - spec/fixtures/chef_repo/roles-expected-metadata/unit-inherit-both.json
checksums.yaml DELETED
@@ -1,15 +0,0 @@
1
- ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- YWQxNmQ0NDdkNGMzZmRlMzVhOTMzNzJjODFlMDIyZTFkZjUyY2RiNA==
5
- data.tar.gz: !binary |-
6
- Y2RmNDdjNDZjNzIxNDIyNWE1MWNlMDZmZWM3ZWYxZjA2NzVjYWI0Nw==
7
- SHA512:
8
- metadata.gz: !binary |-
9
- NmRjOGQwOGVhMjFiZDZiNDVhZWQ3OGE2YTczOTU5MjhhOWNmZTdkYTIzYzYw
10
- OGJmZGExMzM2YmRhMWQ0YTVjZTAzYjJmOTA2N2U2YTEyMGE1OTBmNGM1ODUz
11
- YjU4N2EyMzFjNmE4ZDNjYTMwYTg1NGQ5MWNiOTRlNzUwZGQ0MTA=
12
- data.tar.gz: !binary |-
13
- OGY3NzRhYjY0ZTc1OGI2N2RmN2FlZWEwMGUxYmY1NjU0YWZmMjc0N2YyYWRi
14
- ZjZmZTc1NGQ2OTRkYWNmMjUxM2JiOWRmZGRkNzg2ZGNlN2JkOTg5MjAyYzA4
15
- MDI5YzQ4NzgxYmEzNmJlNjAzN2ZmNTExMTM1N2E5ZTU5NmQ3NDc=