ec2launcher 1.6.10 → 1.6.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/CHANGELOG.md +8 -0
- data/lib/ec2launcher/version.rb +1 -1
- data/startup-scripts/setup_instance.rb +10 -10
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
MzNhM2JmODY2YjgzN2U3ZDBkODc5NDllNTdlMWI3ZDA1ZDdlMTk1Nw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ZWIxMWMxNzE0ZTMyYTIzZTlhMGJiNTQ0MjU5NmU5ZGRiNmVlMmQxYg==
|
7
7
|
!binary "U0hBNTEy":
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
NTIwYThjNmVlYWVhMTI0NTJhNTU2ODI5ZWNlODQ1ZWUxZmYwMmE1MWIwNmYz
|
10
|
+
OTYxZmE5NzRlNDQxMjMwY2E4ZTA5ODc5ZjY1Njc4MjA5Njk4ZjhmMTMwOTQz
|
11
|
+
Yjc4YWM5MTgyZTM1NjlmMmFkYzU1MzJjYmZmOWNkZjhlZDQxYzk=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
Njk0OGMwZGZhYjAzOWI5MmJjMzNhMGQxMjQyNDUxN2YyNGY5ZDBmNDcwYWJh
|
14
|
+
NzljZDk1YzZmYmVlZWJhYTQwNTUxMmU5Nzg3MmFiN2ZiNWFmZDdlMDA4MGUx
|
15
|
+
YTlhNTRmZmVlNzBmMTNhYjBlMTZlNmNmNDkwNjE4ODAwZmQ2Mzk=
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
## 1.6.12
|
2
|
+
|
3
|
+
* More fixes for handling block devices on startup.
|
4
|
+
|
5
|
+
## 1.6.11
|
6
|
+
|
7
|
+
* Fixed two additional small typos with handling block devices in raid arrays on startup.
|
8
|
+
|
1
9
|
## 1.6.10
|
2
10
|
|
3
11
|
* Fixed small typo with handling block devices in raid arrays on startup.
|
data/lib/ec2launcher/version.rb
CHANGED
@@ -369,34 +369,34 @@ EOF
|
|
369
369
|
raid_array_count = 0
|
370
370
|
next_device_name = "xvdj"
|
371
371
|
instance_data["block_devices"].each do |block_device|
|
372
|
-
if block_device
|
372
|
+
if block_device["raid_level"].nil?
|
373
373
|
# If we're not cloning an existing snapshot, then we need to partition and format the drive.
|
374
374
|
if @options.clone_host.nil?
|
375
375
|
partition_devices([ "/dev/#{next_device_name}" ])
|
376
376
|
format_filesystem(@system_arch, "/dev/#{next_device_name}1")
|
377
377
|
end
|
378
378
|
|
379
|
-
if block_device
|
380
|
-
set_block_read_ahead("/dev/#{next_device_name}1", block_device
|
379
|
+
if block_device["block_ra"]
|
380
|
+
set_block_read_ahead("/dev/#{next_device_name}1", block_device["block_ra"])
|
381
381
|
end
|
382
382
|
|
383
|
-
mount_device("/dev/#{next_device_name}1", block_device
|
383
|
+
mount_device("/dev/#{next_device_name}1", block_device["mount"], block_device["owner"], block_device["group"], @default_fs_type)
|
384
384
|
next_device_name.next!
|
385
385
|
else
|
386
386
|
raid_devices = []
|
387
|
-
build_block_devices(block_device
|
387
|
+
build_block_devices(block_device["count"], next_device_name) do |device_name, index|
|
388
388
|
raid_devices << "/dev/#{device_name}"
|
389
389
|
next_device_name = device_name
|
390
390
|
end
|
391
391
|
puts "Setting up attached raid array... system_arch = #{@system_arch}, raid_devices = #{raid_devices}, device = /dev/md#{(127 - raid_array_count).to_s}"
|
392
|
-
raid_device_name = setup_attached_raid_array(@system_arch, raid_devices, "/dev/md#{(127 - raid_array_count).to_s}", block_device
|
392
|
+
raid_device_name = setup_attached_raid_array(@system_arch, raid_devices, "/dev/md#{(127 - raid_array_count).to_s}", block_device["raid_level"].to_i, ! @options.clone_host.nil?)
|
393
393
|
|
394
|
-
if block_device.respond_to?(:block_ra) && block_device
|
395
|
-
raid_devices.each {|device_name| set_block_read_ahead("#{device_name}1", block_device
|
396
|
-
set_block_read_ahead(raid_device_name, block_device
|
394
|
+
if block_device.respond_to?(:block_ra) && block_device["block_ra"]
|
395
|
+
raid_devices.each {|device_name| set_block_read_ahead("#{device_name}1", block_device["block_ra"]) }
|
396
|
+
set_block_read_ahead(raid_device_name, block_device["block_ra"])
|
397
397
|
end
|
398
398
|
|
399
|
-
mount_device(raid_device_name, block_device
|
399
|
+
mount_device(raid_device_name, block_device["mount"], block_device["owner"], block_device["group"], @default_fs_type)
|
400
400
|
raid_array_count += 1
|
401
401
|
end
|
402
402
|
end
|