Use the AWS instance type in the cfn_init scenario
All the other resources in the template are of the AWS kind and this will help with merging I9d01c5e7de630df5058429353fa17b3536ee8807. This was derived from tempest change I61346b569ed16d8a3c7610a85351ef723287fd83 Change-Id: Icd15a9863c00e63409af635b24938bec3f125e16 Co-Authored-By: Tomas Sedovic <tomas@sedovic.cz>
This commit is contained in:
parent
69a3599767
commit
39218d06d5
@ -9,7 +9,7 @@ Parameters:
|
|||||||
Type: String
|
Type: String
|
||||||
image:
|
image:
|
||||||
Type: String
|
Type: String
|
||||||
network:
|
subnet:
|
||||||
Type: String
|
Type: String
|
||||||
timeout:
|
timeout:
|
||||||
Type: Number
|
Type: Number
|
||||||
@ -28,7 +28,7 @@ Resources:
|
|||||||
Properties:
|
Properties:
|
||||||
UserName: {Ref: CfnUser}
|
UserName: {Ref: CfnUser}
|
||||||
SmokeServer:
|
SmokeServer:
|
||||||
Type: OS::Nova::Server
|
Type: AWS::EC2::Instance
|
||||||
Metadata:
|
Metadata:
|
||||||
AWS::CloudFormation::Init:
|
AWS::CloudFormation::Init:
|
||||||
config:
|
config:
|
||||||
@ -48,14 +48,13 @@ Resources:
|
|||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
Properties:
|
Properties:
|
||||||
image: {Ref: image}
|
ImageId: {Ref: image}
|
||||||
flavor: {Ref: flavor}
|
InstanceType: {Ref: flavor}
|
||||||
key_name: {Ref: key_name}
|
KeyName: {Ref: key_name}
|
||||||
security_groups:
|
SubnetId: {Ref: subnet}
|
||||||
|
SecurityGroups:
|
||||||
- {Ref: SmokeSecurityGroup}
|
- {Ref: SmokeSecurityGroup}
|
||||||
networks:
|
UserData:
|
||||||
- uuid: {Ref: network}
|
|
||||||
user_data:
|
|
||||||
Fn::Replace:
|
Fn::Replace:
|
||||||
- WaitHandle: {Ref: WaitHandle}
|
- WaitHandle: {Ref: WaitHandle}
|
||||||
- |
|
- |
|
||||||
@ -79,4 +78,4 @@ Outputs:
|
|||||||
SmokeServerIp:
|
SmokeServerIp:
|
||||||
Description: IP address of server
|
Description: IP address of server
|
||||||
Value:
|
Value:
|
||||||
Fn::GetAtt: [SmokeServer, first_address]
|
Fn::GetAtt: [SmokeServer, PublicIp]
|
||||||
|
@ -37,7 +37,7 @@ class CfnInitIntegrationTest(test.HeatIntegrationTest):
|
|||||||
'flavor': self.conf.instance_type,
|
'flavor': self.conf.instance_type,
|
||||||
'image': self.conf.image_ref,
|
'image': self.conf.image_ref,
|
||||||
'timeout': self.conf.build_timeout,
|
'timeout': self.conf.build_timeout,
|
||||||
'network': net['id'],
|
'subnet': net['subnets'][0],
|
||||||
}
|
}
|
||||||
|
|
||||||
# create the stack
|
# create the stack
|
||||||
|
Loading…
Reference in New Issue
Block a user