From de34c04d4f53e39f83acffce6570de660a3f7a94 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 15 Sep 2015 15:17:41 +0200 Subject: [PATCH] bug #3743: Add support for security group ids, to use vpcs providing a subnet in EC2 --- .../templates-tab/form-panels/create/wizard-tabs/hybrid.js | 5 +++++ src/vmm_mad/remotes/ec2/ec2_driver.rb | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js index 1310f48008..4b553a4742 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/hybrid.js @@ -99,6 +99,11 @@ define(function(require) { label: Locale.tr("Security Groups"), tooltip: Locale.tr("Name of the security group. You can specify more than one security group (comma separated).") }, + { + name: "SECURITYGROUPIDS", + label: Locale.tr("Security Group Ids"), + tooltip: Locale.tr("Id of the security group. You can specify more than one security group (comma separated).") + }, { name: "SUBNETID", label: Locale.tr("Subnet ID"), diff --git a/src/vmm_mad/remotes/ec2/ec2_driver.rb b/src/vmm_mad/remotes/ec2/ec2_driver.rb index 401b8c2bfb..ffe792771e 100755 --- a/src/vmm_mad/remotes/ec2/ec2_driver.rb +++ b/src/vmm_mad/remotes/ec2/ec2_driver.rb @@ -124,6 +124,10 @@ class EC2Driver :opt => 'security_groups', :proc => lambda {|str| str.split(',')} }, + "SECURITYGROUPIDS" => { + :opt => 'security_group_ids', + :proc => lambda {|str| str.split(',')} + }, "AVAILABILITYZONE" => { :opt => 'placement/availability_zone' },