Fix improper keys in HOT templates
We've been doing stronger validation nowadays and several templates are container upper-case keys that don't validate anymore. This patch fixes them. Change-Id: I791195104484fa17096d6b7833387ef2d3f9acc0
This commit is contained in:
parent
e564ec5a9e
commit
a5b325551d
@ -90,7 +90,7 @@ resources:
|
|||||||
# soon as it is available
|
# soon as it is available
|
||||||
type: AWS::EC2::Instance
|
type: AWS::EC2::Instance
|
||||||
# Have to use AWS::EC::Instance metadata syntax for now
|
# Have to use AWS::EC::Instance metadata syntax for now
|
||||||
Metadata:
|
metadata:
|
||||||
AWS::CloudFormation::Init:
|
AWS::CloudFormation::Init:
|
||||||
config:
|
config:
|
||||||
packages:
|
packages:
|
||||||
|
@ -3,7 +3,7 @@ description: Template which creates a Swift container ressource
|
|||||||
|
|
||||||
resources:
|
resources:
|
||||||
SwiftContainerWebsite:
|
SwiftContainerWebsite:
|
||||||
DeletionPolicy: "Delete"
|
deletion_policy: "Delete"
|
||||||
type: OS::Swift::Container
|
type: OS::Swift::Container
|
||||||
properties:
|
properties:
|
||||||
X-Container-Read: ".r:*"
|
X-Container-Read: ".r:*"
|
||||||
|
@ -184,7 +184,7 @@ resources:
|
|||||||
|
|
||||||
broker_wait_condition:
|
broker_wait_condition:
|
||||||
type: AWS::CloudFormation::WaitCondition
|
type: AWS::CloudFormation::WaitCondition
|
||||||
DependsOn: broker_instance
|
depends_on: broker_instance
|
||||||
properties:
|
properties:
|
||||||
Handle:
|
Handle:
|
||||||
get_resource: broker_wait_handle
|
get_resource: broker_wait_handle
|
||||||
@ -273,7 +273,7 @@ resources:
|
|||||||
|
|
||||||
node_wait_condition:
|
node_wait_condition:
|
||||||
type: AWS::CloudFormation::WaitCondition
|
type: AWS::CloudFormation::WaitCondition
|
||||||
DependsOn: node_instance
|
depends_on: node_instance
|
||||||
properties:
|
properties:
|
||||||
Handle:
|
Handle:
|
||||||
get_resource: node_wait_handle
|
get_resource: node_wait_handle
|
||||||
|
@ -58,10 +58,10 @@ parameters:
|
|||||||
description: Name of an existing keypair to enable SSH access to the instances
|
description: Name of an existing keypair to enable SSH access to the instances
|
||||||
type: string
|
type: string
|
||||||
domain:
|
domain:
|
||||||
Description: Your DNS domain
|
description: Your DNS domain
|
||||||
type: string
|
type: string
|
||||||
hosts_domain:
|
hosts_domain:
|
||||||
Description: Openshift hosts domain
|
description: Openshift hosts domain
|
||||||
type: string
|
type: string
|
||||||
broker_server_flavor:
|
broker_server_flavor:
|
||||||
description: Flavor of broker server
|
description: Flavor of broker server
|
||||||
@ -245,7 +245,7 @@ parameters:
|
|||||||
resources:
|
resources:
|
||||||
ose_broker_sec_grp:
|
ose_broker_sec_grp:
|
||||||
type: AWS::EC2::SecurityGroup
|
type: AWS::EC2::SecurityGroup
|
||||||
Properties:
|
properties:
|
||||||
GroupDescription: broker firewall rules
|
GroupDescription: broker firewall rules
|
||||||
VpcId: { get_param: private_net_id }
|
VpcId: { get_param: private_net_id }
|
||||||
SecurityGroupIngress:
|
SecurityGroupIngress:
|
||||||
@ -387,7 +387,7 @@ resources:
|
|||||||
###
|
###
|
||||||
broker1_instance:
|
broker1_instance:
|
||||||
type: OS::Nova::Server
|
type: OS::Nova::Server
|
||||||
DependsOn: broker_wait_condition
|
depends_on: broker_wait_condition
|
||||||
properties:
|
properties:
|
||||||
name: ose_broker1
|
name: ose_broker1
|
||||||
image: { get_param: broker_image }
|
image: { get_param: broker_image }
|
||||||
|
@ -48,10 +48,10 @@ parameters:
|
|||||||
description: Name of an existing keypair to enable SSH access to the instances
|
description: Name of an existing keypair to enable SSH access to the instances
|
||||||
type: string
|
type: string
|
||||||
domain:
|
domain:
|
||||||
Description: Your DNS domain
|
description: Your DNS domain
|
||||||
type: string
|
type: string
|
||||||
hosts_domain:
|
hosts_domain:
|
||||||
Description: Openshift hosts domain
|
description: Openshift hosts domain
|
||||||
type: string
|
type: string
|
||||||
avail_zone:
|
avail_zone:
|
||||||
description: >
|
description: >
|
||||||
@ -193,7 +193,7 @@ parameters:
|
|||||||
resources:
|
resources:
|
||||||
ose_node_sec_grp:
|
ose_node_sec_grp:
|
||||||
type: AWS::EC2::SecurityGroup
|
type: AWS::EC2::SecurityGroup
|
||||||
Properties:
|
properties:
|
||||||
GroupDescription: Node firewall rules
|
GroupDescription: Node firewall rules
|
||||||
VpcId: { get_param: private_net_id }
|
VpcId: { get_param: private_net_id }
|
||||||
SecurityGroupIngress:
|
SecurityGroupIngress:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user