ironfan 3.1.5 → 3.1.6
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +7 -8
- data/README.md +6 -0
- data/TODO.md +140 -29
- data/VERSION +1 -1
- data/config/ubuntu10.04-ironfan.erb +11 -5
- data/config/ubuntu11.10-ironfan.erb +12 -6
- data/ironfan.gemspec +25 -23
- data/lib/chef/knife/bootstrap/centos6.2-ironfan.erb +148 -0
- data/lib/chef/knife/bootstrap/ubuntu10.04-ironfan.erb +11 -5
- data/lib/chef/knife/bootstrap/ubuntu11.10-ironfan.erb +12 -6
- data/lib/chef/knife/cluster_bootstrap.rb +4 -3
- data/lib/chef/knife/cluster_kick.rb +9 -8
- data/lib/chef/knife/cluster_kill.rb +1 -0
- data/lib/chef/knife/cluster_launch.rb +2 -2
- data/lib/chef/knife/cluster_proxy.rb +5 -4
- data/lib/chef/knife/cluster_show.rb +1 -1
- data/lib/chef/knife/cluster_ssh.rb +6 -5
- data/lib/chef/knife/cluster_stop.rb +3 -0
- data/lib/chef/knife/cluster_vagrant.rb +2 -2
- data/lib/chef/knife/ironfan_knife_common.rb +1 -1
- data/lib/chef/knife/vagrant/skeleton_vagrantfile.rb +5 -2
- data/lib/ironfan/chef_layer.rb +3 -1
- data/lib/ironfan/cloud.rb +146 -107
- data/lib/ironfan/discovery.rb +13 -0
- data/lib/ironfan/fog_layer.rb +42 -3
- data/lib/ironfan/security_group.rb +16 -4
- data/lib/ironfan/server.rb +29 -0
- data/lib/ironfan.rb +1 -1
- data/notes/INSTALL-cloud_setup.md +14 -11
- data/notes/INSTALL.md +6 -1
- data/notes/core_concepts.md +1 -1
- data/notes/ec2-pricing_and_capacity.md +24 -18
- data/notes/version-3_2.md +273 -0
- data/spec/spec_helper.rb +26 -34
- metadata +31 -29
|
@@ -35,13 +35,21 @@ class Chef
|
|
|
35
35
|
class ClusterKick < Chef::Knife::ClusterSsh
|
|
36
36
|
|
|
37
37
|
import_banner_and_options(Chef::Knife::ClusterSsh)
|
|
38
|
-
banner 'knife cluster kick CLUSTER-[
|
|
38
|
+
banner 'knife cluster kick CLUSTER[-FACET[-INDEXES]] (options) - start a run of chef-client on each server, tailing the logs and exiting when the run completes.'
|
|
39
39
|
|
|
40
40
|
option :pid_file,
|
|
41
41
|
:long => "--pid_file",
|
|
42
42
|
:description => "Where to find the pid file. Typically /var/run/chef/client.pid (init.d) or /etc/sv/chef-client/supervise/pid (runit)",
|
|
43
43
|
:default => "/etc/sv/chef-client/supervise/pid"
|
|
44
44
|
|
|
45
|
+
def run
|
|
46
|
+
@name_args = [ @name_args.join('-') ]
|
|
47
|
+
config[:display_target] = true
|
|
48
|
+
script = Erubis::Eruby.new(KICKSTART_SCRIPT).result(:config => config)
|
|
49
|
+
@name_args[1] = script
|
|
50
|
+
super
|
|
51
|
+
end
|
|
52
|
+
|
|
45
53
|
unless defined?(KICKSTART_SCRIPT)
|
|
46
54
|
KICKSTART_SCRIPT = <<EOF
|
|
47
55
|
#!/bin/bash
|
|
@@ -83,13 +91,6 @@ fi
|
|
|
83
91
|
EOF
|
|
84
92
|
end
|
|
85
93
|
|
|
86
|
-
def run
|
|
87
|
-
@name_args = [ @name_args.join('-') ]
|
|
88
|
-
script = Erubis::Eruby.new(KICKSTART_SCRIPT).result(:config => config)
|
|
89
|
-
@name_args[1] = script
|
|
90
|
-
super
|
|
91
|
-
end
|
|
92
|
-
|
|
93
94
|
end
|
|
94
95
|
end
|
|
95
96
|
end
|
|
@@ -58,6 +58,7 @@ class Chef
|
|
|
58
58
|
|
|
59
59
|
def display(target, *args, &block)
|
|
60
60
|
super
|
|
61
|
+
ui.info Formatador.display_line("servers with [red]'permanent=true'[reset] ignored: [blue]#{target.select(&:permanent?).map(&:fullname).inspect}[reset]. (To kill, change 'permanent' to false, run knife cluster sync, and re-try)") unless target.none?(&:permanent?)
|
|
61
62
|
ui.info Formatador.display_line("[red]Bogus servers detected[reset]: [blue]#{target.bogus_servers.map(&:fullname).inspect}[reset]") unless target.bogus_servers.empty?
|
|
62
63
|
end
|
|
63
64
|
|
|
@@ -30,8 +30,8 @@ class Chef
|
|
|
30
30
|
Chef::Knife::ClusterBootstrap.load_deps
|
|
31
31
|
end
|
|
32
32
|
|
|
33
|
-
banner "knife cluster launch CLUSTER-[
|
|
34
|
-
[ :ssh_port, :ssh_password, :identity_file, :use_sudo,
|
|
33
|
+
banner "knife cluster launch CLUSTER[-FACET[-INDEXES]] (options) - Creates chef node and chef apiclient, pre-populates chef node, and instantiates in parallel their cloud machines. With --bootstrap flag, will ssh in to machines as they become ready and launch the bootstrap process"
|
|
34
|
+
[ :ssh_port, :ssh_user, :ssh_password, :identity_file, :use_sudo,
|
|
35
35
|
:prerelease, :bootstrap_version, :template_file, :distro,
|
|
36
36
|
:bootstrap_runs_chef_client, :host_key_verify
|
|
37
37
|
].each do |name|
|
|
@@ -33,7 +33,7 @@ class Chef
|
|
|
33
33
|
class ClusterProxy < Ironfan::Script
|
|
34
34
|
|
|
35
35
|
import_banner_and_options(Chef::Knife::ClusterSsh, :except => [:concurrency, ])
|
|
36
|
-
banner 'knife cluster proxy CLUSTER-[
|
|
36
|
+
banner 'knife cluster proxy CLUSTER[-FACET[-INDEXES]] (options) - Runs the ssh command to open a SOCKS proxy to the given host, and writes a PAC (automatic proxy config) file to /tmp/ironfan_proxy-YOURNAME.pac. Only the first host is used, even if multiple match.'
|
|
37
37
|
|
|
38
38
|
option :background,
|
|
39
39
|
:long => "--[no-]background",
|
|
@@ -65,9 +65,10 @@ class Chef
|
|
|
65
65
|
config[:identity_file] ||= svr.cloud.ssh_identity_file
|
|
66
66
|
config[:host_key_verify] ||= Chef::Config[:knife][:host_key_verify] || (not config[:no_host_key_verify]) # pre-vs-post 0.10.4
|
|
67
67
|
|
|
68
|
-
|
|
69
|
-
if
|
|
70
|
-
|
|
68
|
+
address = svr.public_hostname
|
|
69
|
+
if address.blank? && (svr.chef_node)
|
|
70
|
+
address = format_for_display( svr.chef_node )[config[:attribute]]
|
|
71
|
+
end
|
|
71
72
|
|
|
72
73
|
cmd = [ 'ssh', '-N' ]
|
|
73
74
|
cmd += [ '-D', config[:socks_port].to_s ]
|
|
@@ -26,7 +26,7 @@ class Chef
|
|
|
26
26
|
Ironfan::KnifeCommon.load_deps
|
|
27
27
|
end
|
|
28
28
|
|
|
29
|
-
banner "knife cluster show CLUSTER-[
|
|
29
|
+
banner "knife cluster show CLUSTER[-FACET[-INDEXES]] (options) - a helpful display of cluster's cloud and chef state"
|
|
30
30
|
|
|
31
31
|
option :cloud,
|
|
32
32
|
:long => "--[no-]cloud",
|
|
@@ -29,7 +29,7 @@ class Chef
|
|
|
29
29
|
Ironfan::KnifeCommon.load_deps
|
|
30
30
|
end
|
|
31
31
|
|
|
32
|
-
banner 'knife cluster ssh CLUSTER-[
|
|
32
|
+
banner 'knife cluster ssh CLUSTER[-FACET[-INDEXES]] COMMAND (options)'
|
|
33
33
|
Chef::Knife::Ssh.options.each do |name, hsh|
|
|
34
34
|
next if name == :attribute
|
|
35
35
|
option name, hsh
|
|
@@ -43,7 +43,7 @@ class Chef
|
|
|
43
43
|
def configure_session
|
|
44
44
|
target = get_slice(@name_args[0]).select(&:sshable?)
|
|
45
45
|
|
|
46
|
-
display(target) if config[:verbose]
|
|
46
|
+
display(target) if config[:verbose] || config[:display_target]
|
|
47
47
|
|
|
48
48
|
config[:attribute] ||= Chef::Config[:knife][:ssh_address_attribute] || "fqdn"
|
|
49
49
|
config[:ssh_user] ||= Chef::Config[:knife][:ssh_user]
|
|
@@ -51,9 +51,10 @@ class Chef
|
|
|
51
51
|
|
|
52
52
|
@action_nodes = target.chef_nodes
|
|
53
53
|
addresses = target.servers.map do |svr|
|
|
54
|
-
|
|
55
|
-
if
|
|
56
|
-
|
|
54
|
+
address = svr.public_hostname
|
|
55
|
+
if address.blank? && (svr.chef_node)
|
|
56
|
+
address = format_for_display( svr.chef_node )[config[:attribute]]
|
|
57
|
+
end
|
|
57
58
|
address
|
|
58
59
|
end.compact
|
|
59
60
|
|
|
@@ -37,6 +37,9 @@ class Chef
|
|
|
37
37
|
def confirm_execution(target)
|
|
38
38
|
ui.info " Unless these nodes are backed by EBS volumes, this will result in loss of all data"
|
|
39
39
|
ui.info " not saved elsewhere. Even if they are EBS backed, there may still be some data loss."
|
|
40
|
+
if target.any?(&:permanent?)
|
|
41
|
+
ui.warn "These servers are marked as 'permanent=true': #{ui.color(target.select(&:permanent?).map(&:name).join('.'), :red)}"
|
|
42
|
+
end
|
|
40
43
|
confirm_or_exit("Are you absolutely certain that you want to perform this action? (Type 'Yes' to confirm) ", 'Yes')
|
|
41
44
|
end
|
|
42
45
|
end
|
|
@@ -52,7 +52,7 @@ class Chef
|
|
|
52
52
|
require File.expand_path('vagrant/ironfan_provisioners', IRONFAN_DIR)
|
|
53
53
|
end
|
|
54
54
|
|
|
55
|
-
banner "knife cluster vagrant CMD CLUSTER-[
|
|
55
|
+
banner "knife cluster vagrant CMD CLUSTER[-FACET[-INDEXES]] (options) - runs the given command against a vagrant environment created from your cluster definition. EARLY, use at your own risk"
|
|
56
56
|
|
|
57
57
|
option :cloud,
|
|
58
58
|
:long => "--cloud PROVIDER",
|
|
@@ -63,7 +63,7 @@ class Chef
|
|
|
63
63
|
|
|
64
64
|
def run
|
|
65
65
|
# The subnet for this world
|
|
66
|
-
Chef::Config.
|
|
66
|
+
Chef::Config.host_network_base ||= '33.33.33'
|
|
67
67
|
# Location that cookbooks, roles, etc will be mounted on vm
|
|
68
68
|
# set to false to skip
|
|
69
69
|
Chef::Config.homebase_on_vm_dir "/homebase" if Chef::Config.homebase_on_vm_dir.nil?
|
|
@@ -188,7 +188,7 @@ module Ironfan
|
|
|
188
188
|
option name, info
|
|
189
189
|
end
|
|
190
190
|
options[:description] ||= "#{sub_command} all servers described by given cluster slice"
|
|
191
|
-
banner "knife cluster #{"%-11s" % sub_command} CLUSTER-[
|
|
191
|
+
banner "knife cluster #{"%-11s" % sub_command} CLUSTER[-FACET[-INDEXES]] (options) - #{options[:description]}"
|
|
192
192
|
end
|
|
193
193
|
end
|
|
194
194
|
def self.included(base)
|
|
@@ -32,8 +32,10 @@ Vagrant::Config.run do |config|
|
|
|
32
32
|
# learn more abt vagrant to figure out where.
|
|
33
33
|
#
|
|
34
34
|
|
|
35
|
+
# TODO: FIXME: WTF is this hoary horseshit? At *least* do it by cluster-facet,
|
|
36
|
+
# not just facet (especially since the examples given are all *clusters*)
|
|
35
37
|
def ip_for(svr)
|
|
36
|
-
"#{Chef::Config.
|
|
38
|
+
"#{Chef::Config.host_network_base}.#{(Chef::Config.host_network_ip_mapping[svr.facet_name] || 30) + svr.facet_index}"
|
|
37
39
|
end
|
|
38
40
|
|
|
39
41
|
# FIXME: things like this should be imputed by the `cloud` statement
|
|
@@ -47,7 +49,7 @@ Vagrant::Config.run do |config|
|
|
|
47
49
|
#
|
|
48
50
|
|
|
49
51
|
# Boot with a GUI so you can see the screen. (Default is headless)
|
|
50
|
-
config.vm.boot_mode = :gui
|
|
52
|
+
#config.vm.boot_mode = :gui
|
|
51
53
|
|
|
52
54
|
# Mount this to see all our chefs and stuff: [type, vm_path, host_path]
|
|
53
55
|
config.vm.share_folder "homebase", Chef::Config.homebase_on_vm_dir, Chef::Config.homebase
|
|
@@ -65,6 +67,7 @@ Vagrant::Config.run do |config|
|
|
|
65
67
|
|
|
66
68
|
cfg.vm.box = svr.cloud.image_name
|
|
67
69
|
cfg.vm.network :hostonly, ip_for(svr)
|
|
70
|
+
# TODO: FIXME: Need to set the "private IP" for each vagrant to something distinct for each node
|
|
68
71
|
|
|
69
72
|
#
|
|
70
73
|
# See http://www.virtualbox.org/manual/ch08.html#idp12418752
|
data/lib/ironfan/chef_layer.rb
CHANGED
|
@@ -30,8 +30,9 @@ module Ironfan
|
|
|
30
30
|
# Run given block unless in dry_run mode (Ironfan.chef_config[:dry_run]
|
|
31
31
|
# is true)
|
|
32
32
|
def unless_dry_run
|
|
33
|
-
if Ironfan.
|
|
33
|
+
if Ironfan.dry_run?
|
|
34
34
|
ui.info(" ... but not really (#{ui.color("dry run", :bold, :yellow)} for server #{name})")
|
|
35
|
+
return nil
|
|
35
36
|
else
|
|
36
37
|
yield
|
|
37
38
|
end
|
|
@@ -203,6 +204,7 @@ module Ironfan
|
|
|
203
204
|
step(" setting node runlist and essential attributes")
|
|
204
205
|
@chef_node.run_list = Chef::RunList.new(*@settings[:run_list])
|
|
205
206
|
@chef_node.normal[:organization] = organization if organization
|
|
207
|
+
@chef_node.normal[:permanent] = cloud.permanent if cloud.permanent
|
|
206
208
|
@chef_node.override[:cluster_name] = cluster_name
|
|
207
209
|
@chef_node.override[:facet_name] = facet_name
|
|
208
210
|
@chef_node.override[:facet_index] = facet_index
|
data/lib/ironfan/cloud.rb
CHANGED
|
@@ -123,11 +123,13 @@ module Ironfan
|
|
|
123
123
|
:region, :availability_zones, :backing,
|
|
124
124
|
:spot_price, :spot_price_fraction,
|
|
125
125
|
:user_data, :security_groups,
|
|
126
|
-
:monitoring
|
|
126
|
+
:monitoring, :placement_group,
|
|
127
|
+
:vpc, :subnet
|
|
127
128
|
)
|
|
128
129
|
|
|
129
130
|
def initialize(*args)
|
|
130
131
|
super *args
|
|
132
|
+
name :ec2 # cloud provider name
|
|
131
133
|
@settings[:security_groups] ||= Mash.new
|
|
132
134
|
@settings[:user_data] ||= Mash.new
|
|
133
135
|
end
|
|
@@ -191,6 +193,11 @@ module Ironfan
|
|
|
191
193
|
end
|
|
192
194
|
end
|
|
193
195
|
|
|
196
|
+
def placement_group(val=nil)
|
|
197
|
+
set(:placement_group, val)
|
|
198
|
+
@settings[:placement_group] || owner.cluster_name
|
|
199
|
+
end
|
|
200
|
+
|
|
194
201
|
def default_availability_zone
|
|
195
202
|
availability_zones.first if availability_zones
|
|
196
203
|
end
|
|
@@ -205,17 +212,38 @@ module Ironfan
|
|
|
205
212
|
|
|
206
213
|
# Utility methods
|
|
207
214
|
|
|
215
|
+
require 'pry'
|
|
216
|
+
|
|
208
217
|
def image_info
|
|
209
|
-
|
|
218
|
+
ec2_image_info[ [region, bits, backing, image_name] ] or ( ui.warn "Make sure to define the machine's region, bits, backing and image_name. (Have #{[region, bits, backing, image_name, virtualization].inspect})" ; {} )
|
|
219
|
+
end
|
|
220
|
+
|
|
221
|
+
def ec2_image_info
|
|
222
|
+
return @image_info_mapping if @image_info_mapping
|
|
223
|
+
@image_info_mapping = Chef::Config[:ec2_image_info]
|
|
224
|
+
# @image_info_mapping.each{|key, val| key[4] ||= 'pv' }
|
|
225
|
+
@image_info_mapping
|
|
226
|
+
end
|
|
227
|
+
|
|
228
|
+
def virtualization
|
|
229
|
+
flavor_info[:virtualization] || 'pv'
|
|
210
230
|
end
|
|
211
231
|
|
|
212
232
|
def list_images
|
|
213
233
|
ui.info("Available images:")
|
|
214
|
-
|
|
215
|
-
ui.info("
|
|
234
|
+
ec2_image_info.each do |flavor_name, flavor|
|
|
235
|
+
ui.info(" %-55s\t%s" % [flavor_name, flavor.inspect])
|
|
216
236
|
end
|
|
217
237
|
end
|
|
218
238
|
|
|
239
|
+
def vpc(val=nil)
|
|
240
|
+
set :vpc, val
|
|
241
|
+
end
|
|
242
|
+
|
|
243
|
+
def subnet(val=nil)
|
|
244
|
+
set :subnet, val
|
|
245
|
+
end
|
|
246
|
+
|
|
219
247
|
def flavor(val=nil)
|
|
220
248
|
if val && (not FLAVOR_INFO.has_key?(val.to_s))
|
|
221
249
|
ui.warn("Unknown machine image flavor '#{val}'")
|
|
@@ -235,31 +263,35 @@ module Ironfan
|
|
|
235
263
|
end
|
|
236
264
|
end
|
|
237
265
|
|
|
238
|
-
# code $/
|
|
239
|
-
# t1.micro
|
|
240
|
-
# m1.small
|
|
241
|
-
#
|
|
242
|
-
#
|
|
243
|
-
#
|
|
244
|
-
#
|
|
245
|
-
# m1.xlarge
|
|
246
|
-
#
|
|
247
|
-
# m2.
|
|
248
|
-
#
|
|
249
|
-
#
|
|
266
|
+
# code $/mo $/day $/hr CPU/$ Mem/$ mem cpu cores cpcore storage bits IO type name
|
|
267
|
+
# t1.micro 15 0.48 .02 13 13 0.61 0.25 0.25 1 0 32 Low Micro Micro
|
|
268
|
+
# m1.small 58 1.92 .08 13 21 1.7 1 1 1 160 32 Moderate Standard Small
|
|
269
|
+
# m1.medium 116 3.84 .165 13 13 3.75 2 2 1 410 32 Moderate Standard Medium
|
|
270
|
+
# c1.medium 120 3.96 .17 30 10 1.7 5 2 2.5 350 32 Moderate High-CPU Medium
|
|
271
|
+
# m1.large 232 7.68 .32 13 23 7.5 4 2 2 850 64 High Standard Large
|
|
272
|
+
# m2.xlarge 327 10.80 .45 14 38 17.1 6.5 2 3.25 420 64 Moderate High-Memory Extra Large
|
|
273
|
+
# m1.xlarge 465 15.36 .64 13 23 15 8 4 2 1690 64 High Standard Extra Large
|
|
274
|
+
# c1.xlarge 479 15.84 .66 30 11 7 20 8 2.5 1690 64 High High-CPU Extra Large
|
|
275
|
+
# m2.2xlarge 653 21.60 .90 14 38 34.2 13 4 3.25 850 64 High High-Memory Double Extra Large
|
|
276
|
+
# m2.4xlarge 1307 43.20 1.80 14 38 68.4 26 8 3.25 1690 64 High High-Memory Quadruple Extra Large
|
|
277
|
+
# cc1.4xlarge 944 31.20 1.30 26 18 23 33.5 8 4.19 1690 64 10GB Compute Quadruple Extra Large
|
|
278
|
+
# cc2.8xlarge 1742 57.60 2.40 37 25 60.5 88 16 5.50 3370 64 Very High 10GB Compute Eight Extra Large
|
|
279
|
+
# cg1.4xlarge 1525 50.40 2.10 16 10 22 33.5 8 4.19 1690 64 Very High 10GB Cluster GPU Quadruple Extra Large
|
|
250
280
|
|
|
251
281
|
FLAVOR_INFO = {
|
|
252
282
|
't1.micro' => { :price => 0.02, :bits => '64-bit', :ram => 686, :cores => 1, :core_size => 0.25, :inst_disks => 0, :inst_disk_size => 0, :ephemeral_volumes => 0 },
|
|
253
|
-
'm1.small' => { :price => 0.
|
|
283
|
+
'm1.small' => { :price => 0.08, :bits => '64-bit', :ram => 1740, :cores => 1, :core_size => 1, :inst_disks => 1, :inst_disk_size => 160, :ephemeral_volumes => 1 },
|
|
284
|
+
'm1.medium' => { :price => 0.165, :bits => '32-bit', :ram => 3840, :cores => 2, :core_size => 1, :inst_disks => 1, :inst_disk_size => 410, :ephemeral_volumes => 1 },
|
|
254
285
|
'c1.medium' => { :price => 0.17, :bits => '32-bit', :ram => 1740, :cores => 2, :core_size => 2.5, :inst_disks => 1, :inst_disk_size => 350, :ephemeral_volumes => 1 },
|
|
255
|
-
'm1.large' => { :price => 0.
|
|
256
|
-
'm2.xlarge' => { :price => 0.
|
|
257
|
-
'c1.xlarge' => { :price => 0.
|
|
258
|
-
'm1.xlarge' => { :price => 0.
|
|
259
|
-
'm2.2xlarge' => { :price =>
|
|
260
|
-
'm2.4xlarge' => { :price =>
|
|
261
|
-
'cc1.4xlarge' => { :price => 1.
|
|
262
|
-
'
|
|
286
|
+
'm1.large' => { :price => 0.32, :bits => '64-bit', :ram => 7680, :cores => 2, :core_size => 2, :inst_disks => 2, :inst_disk_size => 850, :ephemeral_volumes => 2 },
|
|
287
|
+
'm2.xlarge' => { :price => 0.45, :bits => '64-bit', :ram => 18124, :cores => 2, :core_size => 3.25, :inst_disks => 1, :inst_disk_size => 420, :ephemeral_volumes => 1 },
|
|
288
|
+
'c1.xlarge' => { :price => 0.64, :bits => '64-bit', :ram => 7168, :cores => 8, :core_size => 2.5, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4 },
|
|
289
|
+
'm1.xlarge' => { :price => 0.66, :bits => '64-bit', :ram => 15360, :cores => 4, :core_size => 2, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4 },
|
|
290
|
+
'm2.2xlarge' => { :price => 0.90, :bits => '64-bit', :ram => 35020, :cores => 4, :core_size => 3.25, :inst_disks => 2, :inst_disk_size => 850, :ephemeral_volumes => 2 },
|
|
291
|
+
'm2.4xlarge' => { :price => 1.80, :bits => '64-bit', :ram => 70041, :cores => 8, :core_size => 3.25, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 4 },
|
|
292
|
+
'cc1.4xlarge' => { :price => 1.30, :bits => '64-bit', :ram => 23552, :cores => 8, :core_size => 4.19, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
|
|
293
|
+
'cc1.8xlarge' => { :price => 2.40, :bits => '64-bit', :ram => 61952, :cores =>16, :core_size => 5.50, :inst_disks => 8, :inst_disk_size => 3370, :ephemeral_volumes => 4, :placement_groupable => true, :virtualization => 'hvm' },
|
|
294
|
+
'cg1.4xlarge' => { :price => 2.10, :bits => '64-bit', :ram => 22528, :cores => 8, :core_size => 4.19, :inst_disks => 4, :inst_disk_size => 1690, :ephemeral_volumes => 2, :placement_groupable => true, :virtualization => 'hvm' },
|
|
263
295
|
}
|
|
264
296
|
|
|
265
297
|
#
|
|
@@ -278,118 +310,125 @@ module Ironfan
|
|
|
278
310
|
#
|
|
279
311
|
# Lucid (Ubuntu 9.10)
|
|
280
312
|
#
|
|
281
|
-
%w[us-east-1 64-bit instance karmic
|
|
282
|
-
%w[us-east-1 32-bit instance karmic
|
|
283
|
-
%w[us-west-1 64-bit instance karmic
|
|
284
|
-
%w[us-west-1 32-bit instance karmic
|
|
285
|
-
%w[eu-west-1 64-bit instance karmic
|
|
286
|
-
%w[eu-west-1 32-bit instance karmic
|
|
313
|
+
%w[us-east-1 64-bit instance karmic ] => { :image_id => 'ami-55739e3c', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
314
|
+
%w[us-east-1 32-bit instance karmic ] => { :image_id => 'ami-bb709dd2', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
315
|
+
%w[us-west-1 64-bit instance karmic ] => { :image_id => 'ami-cb2e7f8e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
316
|
+
%w[us-west-1 32-bit instance karmic ] => { :image_id => 'ami-c32e7f86', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
317
|
+
%w[eu-west-1 64-bit instance karmic ] => { :image_id => 'ami-05c2e971', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
318
|
+
%w[eu-west-1 32-bit instance karmic ] => { :image_id => 'ami-2fc2e95b', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
287
319
|
|
|
288
320
|
#
|
|
289
321
|
# Lucid (Ubuntu 10.04.3)
|
|
290
322
|
#
|
|
291
|
-
%w[ap-southeast-1 64-bit ebs lucid
|
|
292
|
-
%w[ap-southeast-1 32-bit ebs lucid
|
|
293
|
-
%w[ap-southeast-1 64-bit instance lucid
|
|
294
|
-
%w[ap-southeast-1 32-bit instance lucid
|
|
295
|
-
%w[eu-west-1 64-bit ebs lucid
|
|
296
|
-
%w[eu-west-1 32-bit ebs lucid
|
|
297
|
-
%w[eu-west-1 64-bit instance lucid
|
|
298
|
-
%w[eu-west-1 32-bit instance lucid
|
|
323
|
+
%w[ap-southeast-1 64-bit ebs lucid ] => { :image_id => 'ami-77f28d25', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
324
|
+
%w[ap-southeast-1 32-bit ebs lucid ] => { :image_id => 'ami-4df28d1f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
325
|
+
%w[ap-southeast-1 64-bit instance lucid ] => { :image_id => 'ami-57f28d05', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
326
|
+
%w[ap-southeast-1 32-bit instance lucid ] => { :image_id => 'ami-a5f38cf7', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
327
|
+
%w[eu-west-1 64-bit ebs lucid ] => { :image_id => 'ami-ab4d67df', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
328
|
+
%w[eu-west-1 32-bit ebs lucid ] => { :image_id => 'ami-a94d67dd', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
329
|
+
%w[eu-west-1 64-bit instance lucid ] => { :image_id => 'ami-a54d67d1', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
330
|
+
%w[eu-west-1 32-bit instance lucid ] => { :image_id => 'ami-cf4d67bb', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
299
331
|
#
|
|
300
|
-
%w[us-east-1 64-bit ebs lucid
|
|
301
|
-
%w[us-east-1 32-bit ebs lucid
|
|
302
|
-
%w[us-east-1 64-bit instance lucid
|
|
303
|
-
%w[us-east-1 32-bit instance lucid
|
|
332
|
+
%w[us-east-1 64-bit ebs lucid ] => { :image_id => 'ami-4b4ba522', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
333
|
+
%w[us-east-1 32-bit ebs lucid ] => { :image_id => 'ami-714ba518', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
334
|
+
%w[us-east-1 64-bit instance lucid ] => { :image_id => 'ami-fd4aa494', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
335
|
+
%w[us-east-1 32-bit instance lucid ] => { :image_id => 'ami-2d4aa444', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
304
336
|
#
|
|
305
|
-
%w[us-west-1 64-bit ebs lucid
|
|
306
|
-
%w[us-west-1 32-bit ebs lucid
|
|
307
|
-
%w[us-west-1 64-bit instance lucid
|
|
308
|
-
%w[us-west-1 32-bit instance lucid
|
|
337
|
+
%w[us-west-1 64-bit ebs lucid ] => { :image_id => 'ami-d197c694', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
338
|
+
%w[us-west-1 32-bit ebs lucid ] => { :image_id => 'ami-cb97c68e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
339
|
+
%w[us-west-1 64-bit instance lucid ] => { :image_id => 'ami-c997c68c', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
340
|
+
%w[us-west-1 32-bit instance lucid ] => { :image_id => 'ami-c597c680', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
309
341
|
|
|
310
342
|
#
|
|
311
343
|
# Maverick (Ubuntu 10.10)
|
|
312
344
|
#
|
|
313
|
-
%w[ ap-southeast-1 64-bit ebs maverick
|
|
314
|
-
%w[ ap-southeast-1 64-bit instance maverick
|
|
315
|
-
%w[ ap-southeast-1 32-bit ebs maverick
|
|
316
|
-
%w[ ap-southeast-1 32-bit instance maverick
|
|
345
|
+
%w[ ap-southeast-1 64-bit ebs maverick ] => { :image_id => 'ami-32423c60', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
346
|
+
%w[ ap-southeast-1 64-bit instance maverick ] => { :image_id => 'ami-12423c40', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
347
|
+
%w[ ap-southeast-1 32-bit ebs maverick ] => { :image_id => 'ami-0c423c5e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
348
|
+
%w[ ap-southeast-1 32-bit instance maverick ] => { :image_id => 'ami-7c423c2e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
317
349
|
#
|
|
318
|
-
%w[ eu-west-1 64-bit ebs maverick
|
|
319
|
-
%w[ eu-west-1 64-bit instance maverick
|
|
320
|
-
%w[ eu-west-1 32-bit ebs maverick
|
|
321
|
-
%w[ eu-west-1 32-bit instance maverick
|
|
350
|
+
%w[ eu-west-1 64-bit ebs maverick ] => { :image_id => 'ami-e59ca991', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
351
|
+
%w[ eu-west-1 64-bit instance maverick ] => { :image_id => 'ami-1b9ca96f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
352
|
+
%w[ eu-west-1 32-bit ebs maverick ] => { :image_id => 'ami-fb9ca98f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
353
|
+
%w[ eu-west-1 32-bit instance maverick ] => { :image_id => 'ami-339ca947', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
322
354
|
#
|
|
323
|
-
%w[ us-east-1 64-bit ebs maverick
|
|
324
|
-
%w[ us-east-1 64-bit instance maverick
|
|
325
|
-
%w[ us-east-1 32-bit ebs maverick
|
|
326
|
-
%w[ us-east-1 32-bit instance maverick
|
|
355
|
+
%w[ us-east-1 64-bit ebs maverick ] => { :image_id => 'ami-cef405a7', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
356
|
+
%w[ us-east-1 64-bit instance maverick ] => { :image_id => 'ami-08f40561', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
357
|
+
%w[ us-east-1 32-bit ebs maverick ] => { :image_id => 'ami-ccf405a5', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
358
|
+
%w[ us-east-1 32-bit instance maverick ] => { :image_id => 'ami-a6f504cf', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
327
359
|
#
|
|
328
|
-
%w[ us-west-1 64-bit ebs maverick
|
|
329
|
-
%w[ us-west-1 64-bit instance maverick
|
|
330
|
-
%w[ us-west-1 32-bit ebs maverick
|
|
331
|
-
%w[ us-west-1 32-bit instance maverick
|
|
360
|
+
%w[ us-west-1 64-bit ebs maverick ] => { :image_id => 'ami-af7e2eea', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
361
|
+
%w[ us-west-1 64-bit instance maverick ] => { :image_id => 'ami-a17e2ee4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
362
|
+
%w[ us-west-1 32-bit ebs maverick ] => { :image_id => 'ami-ad7e2ee8', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
363
|
+
%w[ us-west-1 32-bit instance maverick ] => { :image_id => 'ami-957e2ed0', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
332
364
|
|
|
333
365
|
#
|
|
334
366
|
# Natty (Ubuntu 11.04)
|
|
335
367
|
#
|
|
336
|
-
%w[ ap-northeast-1 32-bit ebs natty
|
|
337
|
-
%w[ ap-northeast-1 32-bit instance natty
|
|
338
|
-
%w[ ap-northeast-1 64-bit ebs natty
|
|
339
|
-
%w[ ap-northeast-1 64-bit instance natty
|
|
368
|
+
%w[ ap-northeast-1 32-bit ebs natty ] => { :image_id => 'ami-00b10501', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
369
|
+
%w[ ap-northeast-1 32-bit instance natty ] => { :image_id => 'ami-f0b004f1', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
370
|
+
%w[ ap-northeast-1 64-bit ebs natty ] => { :image_id => 'ami-02b10503', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
371
|
+
%w[ ap-northeast-1 64-bit instance natty ] => { :image_id => 'ami-fab004fb', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
340
372
|
#
|
|
341
|
-
%w[ ap-southeast-1 32-bit ebs natty
|
|
342
|
-
%w[ ap-southeast-1 32-bit instance natty
|
|
343
|
-
%w[ ap-southeast-1 64-bit ebs natty
|
|
344
|
-
%w[ ap-southeast-1 64-bit instance natty
|
|
373
|
+
%w[ ap-southeast-1 32-bit ebs natty ] => { :image_id => 'ami-06255f54', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
374
|
+
%w[ ap-southeast-1 32-bit instance natty ] => { :image_id => 'ami-72255f20', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
375
|
+
%w[ ap-southeast-1 64-bit ebs natty ] => { :image_id => 'ami-04255f56', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
376
|
+
%w[ ap-southeast-1 64-bit instance natty ] => { :image_id => 'ami-7a255f28', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
377
|
+
#
|
|
378
|
+
%w[ eu-west-1 32-bit ebs natty ] => { :image_id => 'ami-a4f7c5d0', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
379
|
+
%w[ eu-west-1 32-bit instance natty ] => { :image_id => 'ami-fef7c58a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
380
|
+
%w[ eu-west-1 64-bit ebs natty ] => { :image_id => 'ami-a6f7c5d2', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
381
|
+
%w[ eu-west-1 64-bit instance natty ] => { :image_id => 'ami-c0f7c5b4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
382
|
+
#
|
|
383
|
+
%w[ us-east-1 32-bit ebs natty ] => { :image_id => 'ami-e358958a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
384
|
+
%w[ us-east-1 32-bit instance natty ] => { :image_id => 'ami-c15994a8', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
385
|
+
%w[ us-east-1 64-bit ebs natty ] => { :image_id => 'ami-fd589594', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
386
|
+
%w[ us-east-1 64-bit instance natty ] => { :image_id => 'ami-71589518', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
387
|
+
#
|
|
388
|
+
%w[ us-west-1 32-bit ebs natty ] => { :image_id => 'ami-43580406', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
389
|
+
%w[ us-west-1 32-bit instance natty ] => { :image_id => 'ami-e95f03ac', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
390
|
+
%w[ us-west-1 64-bit ebs natty ] => { :image_id => 'ami-4d580408', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
391
|
+
%w[ us-west-1 64-bit instance natty ] => { :image_id => 'ami-a15f03e4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
392
|
+
|
|
345
393
|
#
|
|
346
|
-
|
|
347
|
-
%w[ eu-west-1 32-bit instance natty ] => { :image_id => 'ami-fef7c58a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
348
|
-
%w[ eu-west-1 64-bit ebs natty ] => { :image_id => 'ami-a6f7c5d2', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
349
|
-
%w[ eu-west-1 64-bit instance natty ] => { :image_id => 'ami-c0f7c5b4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
394
|
+
# Cluster Compute
|
|
350
395
|
#
|
|
351
|
-
|
|
352
|
-
%w[ us-east-1 32-bit instance natty ] => { :image_id => 'ami-c15994a8', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
353
|
-
%w[ us-east-1 64-bit ebs natty ] => { :image_id => 'ami-fd589594', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
354
|
-
%w[ us-east-1 64-bit instance natty ] => { :image_id => 'ami-71589518', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
396
|
+
# IMAGE ami-6d2ce204 205199409180/Globus Provision 0.4.AMI (Ubuntu 11.04 HVM) 205199409180 available public x86_64 machine ebs hvm xen
|
|
355
397
|
#
|
|
356
|
-
%w[ us-
|
|
357
|
-
%w[ us-west-1 32-bit instance natty ] => { :image_id => 'ami-e95f03ac', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
358
|
-
%w[ us-west-1 64-bit ebs natty ] => { :image_id => 'ami-4d580408', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
359
|
-
%w[ us-west-1 64-bit instance natty ] => { :image_id => 'ami-a15f03e4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
398
|
+
%w[ us-east-1 64-bit ebs natty-cc ] => { :image_id => 'ami-6d2ce204', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
360
399
|
|
|
361
400
|
#
|
|
362
401
|
# Oneiric (Ubuntu 11.10)
|
|
363
402
|
#
|
|
364
|
-
%w[ ap-northeast-1 32-bit ebs oneiric
|
|
365
|
-
%w[ ap-northeast-1 32-bit instance oneiric
|
|
366
|
-
%w[ ap-northeast-1 64-bit ebs oneiric
|
|
367
|
-
%w[ ap-northeast-1 64-bit instance oneiric
|
|
403
|
+
%w[ ap-northeast-1 32-bit ebs oneiric ] => { :image_id => 'ami-84902785', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
404
|
+
%w[ ap-northeast-1 32-bit instance oneiric ] => { :image_id => 'ami-5e90275f', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
405
|
+
%w[ ap-northeast-1 64-bit ebs oneiric ] => { :image_id => 'ami-88902789', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
406
|
+
%w[ ap-northeast-1 64-bit instance oneiric ] => { :image_id => 'ami-7c90277d', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
368
407
|
#
|
|
369
|
-
%w[ ap-southeast-1 32-bit ebs oneiric
|
|
370
|
-
%w[ ap-southeast-1 32-bit instance oneiric
|
|
371
|
-
%w[ ap-southeast-1 64-bit ebs oneiric
|
|
372
|
-
%w[ ap-southeast-1 64-bit instance oneiric
|
|
408
|
+
%w[ ap-southeast-1 32-bit ebs oneiric ] => { :image_id => 'ami-0a327758', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
409
|
+
%w[ ap-southeast-1 32-bit instance oneiric ] => { :image_id => 'ami-00327752', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
410
|
+
%w[ ap-southeast-1 64-bit ebs oneiric ] => { :image_id => 'ami-0832775a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
411
|
+
%w[ ap-southeast-1 64-bit instance oneiric ] => { :image_id => 'ami-04327756', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
373
412
|
#
|
|
374
|
-
%w[ eu-west-1 32-bit ebs oneiric
|
|
375
|
-
%w[ eu-west-1 32-bit instance oneiric
|
|
376
|
-
%w[ eu-west-1 64-bit ebs oneiric
|
|
377
|
-
%w[ eu-west-1 64-bit instance oneiric
|
|
413
|
+
%w[ eu-west-1 32-bit ebs oneiric ] => { :image_id => 'ami-11f0cc65', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
414
|
+
%w[ eu-west-1 32-bit instance oneiric ] => { :image_id => 'ami-4ff0cc3b', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
415
|
+
%w[ eu-west-1 64-bit ebs oneiric ] => { :image_id => 'ami-1df0cc69', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
416
|
+
%w[ eu-west-1 64-bit instance oneiric ] => { :image_id => 'ami-23f0cc57', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
378
417
|
#
|
|
379
|
-
%w[ us-east-1 32-bit ebs oneiric
|
|
380
|
-
%w[ us-east-1 32-bit instance oneiric
|
|
381
|
-
%w[ us-east-1 64-bit ebs oneiric
|
|
382
|
-
%w[ us-east-1 64-bit instance oneiric
|
|
418
|
+
%w[ us-east-1 32-bit ebs oneiric ] => { :image_id => 'ami-a562a9cc', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
419
|
+
%w[ us-east-1 32-bit instance oneiric ] => { :image_id => 'ami-3962a950', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
420
|
+
%w[ us-east-1 64-bit ebs oneiric ] => { :image_id => 'ami-bf62a9d6', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
421
|
+
%w[ us-east-1 64-bit instance oneiric ] => { :image_id => 'ami-c162a9a8', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
383
422
|
#
|
|
384
|
-
%w[ us-west-1 32-bit ebs oneiric
|
|
385
|
-
%w[ us-west-1 32-bit instance oneiric
|
|
386
|
-
%w[ us-west-1 64-bit ebs oneiric
|
|
387
|
-
%w[ us-west-1 64-bit instance oneiric
|
|
423
|
+
%w[ us-west-1 32-bit ebs oneiric ] => { :image_id => 'ami-c9a1fe8c', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
424
|
+
%w[ us-west-1 32-bit instance oneiric ] => { :image_id => 'ami-21a1fe64', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
425
|
+
%w[ us-west-1 64-bit ebs oneiric ] => { :image_id => 'ami-cba1fe8e', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
426
|
+
%w[ us-west-1 64-bit instance oneiric ] => { :image_id => 'ami-3fa1fe7a', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
388
427
|
#
|
|
389
|
-
%w[ us-west-2 32-bit ebs oneiric
|
|
390
|
-
%w[ us-west-2 32-bit instance oneiric
|
|
391
|
-
%w[ us-west-2 64-bit ebs oneiric
|
|
392
|
-
%w[ us-west-2 64-bit instance oneiric
|
|
428
|
+
%w[ us-west-2 32-bit ebs oneiric ] => { :image_id => 'ami-ea9a17da', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
429
|
+
%w[ us-west-2 32-bit instance oneiric ] => { :image_id => 'ami-f49a17c4', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
430
|
+
%w[ us-west-2 64-bit ebs oneiric ] => { :image_id => 'ami-ec9a17dc', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
431
|
+
%w[ us-west-2 64-bit instance oneiric ] => { :image_id => 'ami-fe9a17ce', :ssh_user => 'ubuntu', :bootstrap_distro => "ubuntu10.04-gems", },
|
|
393
432
|
})
|
|
394
433
|
end
|
|
395
434
|
|