ec2launcher 1.7.1 → 1.7.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/CHANGELOG.md +4 -0
- data/lib/ec2launcher.rb +2 -2
- data/lib/ec2launcher/version.rb +2 -2
- data/startup-scripts/setup_instance.rb +7 -13
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ODkxNjJkYWE2NDVlZWQ4M2E5M2NjM2QxNmZhY2YyYTgzODUzMWIwNw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
NjhlN2JmYjk1NmY0MTAxY2I3MWY2YzIwZjkxMmJlNjMyNmYwZGY5NQ==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
Y2MxYzE2ZjNmNjc5OTBhMzgxY2FhODY3MzY5ZjVkNjJiMzQxNDkzNDdlY2Nh
|
10
|
+
M2FhNjMwMDM2ZWEzNDZkZWIwM2U1MDI3NmViZTQxYjk1ZGYzYTA1OTIyOGFl
|
11
|
+
M2ZhODFjYmJhMTlkZjczYjg3MjMyYjczNDliOWI4MzA5ZWYyMmU=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
NzY0NGI1ZTI0NGYyZDQyZGEzNzAxNzIwNjU3ODY4NThjNTQzZWYwOWE1YTI0
|
14
|
+
ZmQxZTI3MDlmNzMxNWFlOWJlNDRlNjQ4ZDgyOTY3OWEyOTIyZjMyOTQ0ZWUz
|
15
|
+
Y2MwN2YwN2M4MDFkNmUyMTFmOTQ5YTg5M2Q5NzgwNmVjMDY2MWU=
|
data/CHANGELOG.md
CHANGED
data/lib/ec2launcher.rb
CHANGED
@@ -293,7 +293,7 @@ module EC2Launcher
|
|
293
293
|
gems = []
|
294
294
|
gems += @environment.gems unless @environment.gems.nil?
|
295
295
|
gems += @application.gems unless @application.gems.nil?
|
296
|
-
gems << {"name" => "ec2launcher", "version" =>
|
296
|
+
gems << {"name" => "ec2launcher", "version" => VERSION}
|
297
297
|
|
298
298
|
##############################
|
299
299
|
# Packages - preinstall
|
@@ -748,7 +748,7 @@ module EC2Launcher
|
|
748
748
|
end
|
749
749
|
|
750
750
|
def load_and_encode_file(pathname)
|
751
|
-
`cat #{pathname} |gzip -f |base64`
|
751
|
+
`cat #{pathname} |sed '/^[ \t]*$/d'|sed '/^[ \t]*#/d'|gzip -f |base64`
|
752
752
|
end
|
753
753
|
|
754
754
|
def load_and_encode_file_with_path(base_path, filename)
|
data/lib/ec2launcher/version.rb
CHANGED
@@ -79,13 +79,10 @@ class InstanceSetup
|
|
79
79
|
@options = option_parser.parse(args)
|
80
80
|
|
81
81
|
begin
|
82
|
-
@logger = Log4r::Logger
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
log_output.formatter = PatternFormatter.new :pattern => "%m"
|
87
|
-
@logger.outputters = log_output
|
88
|
-
end
|
82
|
+
@logger = Log4r::Logger.new 'ec2launcher'
|
83
|
+
log_output = Log4r::Outputter.stdout
|
84
|
+
log_output.formatter = PatternFormatter.new :pattern => "%m"
|
85
|
+
@logger.outputters = log_output
|
89
86
|
rescue
|
90
87
|
end
|
91
88
|
|
@@ -187,11 +184,8 @@ class InstanceSetup
|
|
187
184
|
|
188
185
|
# Process ephemeral devices first
|
189
186
|
ephemeral_drive_count = case @EC2_INSTANCE_TYPE
|
190
|
-
when "
|
191
|
-
when "
|
192
|
-
when "m2.xlarge" then 1
|
193
|
-
when "m2.2xlarge" then 1
|
194
|
-
when "c1.medium" then 1
|
187
|
+
when "t1.micro" then 0
|
188
|
+
when "m3.2xlarge" then 0
|
195
189
|
when "m1.large" then 2
|
196
190
|
when "m2.4xlarge" then 2
|
197
191
|
when "cc1.4xlarge" then 2
|
@@ -199,7 +193,7 @@ class InstanceSetup
|
|
199
193
|
when "m1.xlarge" then 4
|
200
194
|
when "c1.xlarge" then 4
|
201
195
|
when "cc2.8xlarge" then 4
|
202
|
-
else
|
196
|
+
else 1
|
203
197
|
end
|
204
198
|
|
205
199
|
# Partition the ephemeral drives
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ec2launcher
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Laurent
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-05-
|
11
|
+
date: 2013-05-29 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk
|