The hardware profiles listed in the EC2 driver were needlessly different from the actual hardware profiles that EC2 supports. In particular, they were using - instead of . for name separators. Fix this, and also add the m2.4xlarge hardware profile type.
Signed-off-by: Chris Lalancette <[email protected]> --- server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 71 ++++++++++++---------- 1 files changed, 39 insertions(+), 32 deletions(-) diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb index 492a059..20f9365 100644 --- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb +++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb @@ -26,53 +26,60 @@ class EC2Driver < Deltacloud::BaseDriver feature :instances, :user_data - define_hardware_profile('m1-small') do - cpu 1 - memory 1.7 * 1024 - storage 160 - architecture 'i386' + define_hardware_profile('m1.small') do + cpu 1 + memory 1.7 * 1024 + storage 160 + architecture 'i386' end - define_hardware_profile('m1-large') do + define_hardware_profile('m1.large') do cpu 4 - memory 7.5 * 1024 - storage 850 - architecture 'x86_64' + memory 7.5 * 1024 + storage 850 + architecture 'x86_64' end - define_hardware_profile('m1-xlarge') do + define_hardware_profile('m1.xlarge') do cpu 8 - memory 15 * 1024 - storage 1690 - architecture 'x86_64' + memory 15 * 1024 + storage 1690 + architecture 'x86_64' end - define_hardware_profile('c1-medium') do + define_hardware_profile('c1.medium') do cpu 5 - memory 1.7 * 1024 - storage 350 - architecture 'i386' + memory 1.7 * 1024 + storage 350 + architecture 'i386' end - define_hardware_profile('c1-xlarge') do - cpu 20 - memory 7 * 1024 - storage 1690 - architecture 'x86_64' + define_hardware_profile('c1.xlarge') do + cpu 20 + memory 7 * 1024 + storage 1690 + architecture 'x86_64' end - define_hardware_profile('m2-xlarge') do - cpu 6.5 - memory 17.1 * 1024 - storage 420 - architecture 'x86_64' + define_hardware_profile('m2.xlarge') do + cpu 6.5 + memory 17.1 * 1024 + storage 420 + architecture 'x86_64' end - define_hardware_profile('m2-2xlarge') do - cpu 13 - memory 34.2 * 1024 - storage 850 - architecture 'x86_64' + define_hardware_profile('m2.2xlarge') do + cpu 13 + memory 34.2 * 1024 + storage 850 + architecture 'x86_64' + end + + define_hardware_profile('m2.4xlarge') do + cpu 26 + memory 68.4 * 1024 + storage 1690 + architecture 'x86_64' end define_instance_states do -- 1.6.6.1 _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
