commit 9e5354ba94e4bd67c713778d8b1fd5ed28a5893c
author Jenkins <jenkins@review.openstack.org> Fri Jul 12 19:10:48 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Jul 12 19:10:48 2013 +0000
tree 12e35ca5c51b135d39c480ba984326addb9c6c89
parent ba41726d93964011ec829ded8c3b939ecaef4d0f
parent 734af9c1d267d830309344dde01bfc22a0844954

Merge "Configure a heat security group for testing ssh."

tempest/api/orchestration/stacks/test_instance_cfn_init.py

diff --git a/tempest/api/orchestration/stacks/test_instance_cfn_init.py b/tempest/api/orchestration/stacks/test_instance_cfn_init.py
index 16509ea..4f22158 100644
--- a/tempest/api/orchestration/stacks/test_instance_cfn_init.py
+++ b/tempest/api/orchestration/stacks/test_instance_cfn_init.py
@@ -46,6 +46,13 @@
 Resources:
   CfnUser:
     Type: AWS::IAM::User
+  SmokeSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Enable only ping and SSH access
+      SecurityGroupIngress:
+      - {CidrIp: 0.0.0.0/0, FromPort: '-1', IpProtocol: icmp, ToPort: '-1'}
+      - {CidrIp: 0.0.0.0/0, FromPort: '22', IpProtocol: tcp, ToPort: '22'}
   SmokeKeys:
     Type: AWS::IAM::AccessKey
     Properties:
@@ -79,6 +86,8 @@
       ImageId: {Ref: ImageId}
       InstanceType: {Ref: InstanceType}
       KeyName: {Ref: KeyName}
+      SecurityGroups:
+      - {Ref: SmokeSecurityGroup}
       UserData:
         Fn::Base64:
           Fn::Join: