Fix SecurityGroups for AWS::AutoScaling::LaunchConfiguration

Change-Id: Ie3b0663093c9c4bae14cf3311a65ff92715af8c9
Fixes: bug #1180878

diff --git a/heat/engine/resources/autoscaling.py b/heat/engine/resources/autoscaling.py
index 81a0f027b3bd290092b0f238a06ef0958105a486..f26093ce03b3f18aaaaaa7e9a1c5e1fb61a767fe 100644 (file)
--- a/heat/engine/resources/autoscaling.py
+++ b/heat/engine/resources/autoscaling.py
@@ -396,7 +396,7 @@ class LaunchConfiguration(resource.Resource):
                          'Required': True},
         'KeyName': {'Type': 'String'},
         'UserData': {'Type': 'String'},
-        'SecurityGroups': {'Type': 'String'},
+        'SecurityGroups': {'Type': 'List'},
         'KernelId': {'Type': 'String',
                      'Implemented': False},
         'RamDiskId': {'Type': 'String',

diff --git a/heat/tests/test_instance_group.py b/heat/tests/test_instance_group.py
index 5b238719b200160973ec477967535f6f6c48b6bf..5039fd4fa755c0d6cb439b92a2274371505d1911 100644 (file)
--- a/heat/tests/test_instance_group.py
+++ b/heat/tests/test_instance_group.py
@@ -47,6 +47,7 @@ ig_template = '''
         "ImageId"           : "foo",
         "InstanceType"      : "m1.large",
         "KeyName"           : "test",
+        "SecurityGroups"    : [ "sg-1" ],
         "UserData"          : "jsconfig data"
       }
     }