openstack/heat-templates
Code Issues Proposed changes

Fix improper keys in HOT templates

Browse Source 
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:
Thomas Herve 2014-03-27 16:08:44 +01:00
parent e564ec5a9e
commit a5b325551d
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hot/F18/WordPress_NoKey.yaml
View File

@ -90,7 +90,7 @@ resources:
# soon as it is available
type: AWS::EC2::Instance
# Have to use AWS::EC::Instance metadata syntax for now
Metadata:
metadata:
AWS::CloudFormation::Init:
config:
packages:

2
hot/swift.yaml
View File

@ -3,7 +3,7 @@ description: Template which creates a Swift container ressource
resources:
SwiftContainerWebsite:
DeletionPolicy: "Delete"
deletion_policy: "Delete"
type: OS::Swift::Container
properties:
X-Container-Read: ".r:*"

4
openshift-enterprise/heat/neutron/OpenShift-1B1N-neutron.yaml
View File

@ -184,7 +184,7 @@ resources:
broker_wait_condition:
type: AWS::CloudFormation::WaitCondition
DependsOn: broker_instance
depends_on: broker_instance
properties:
Handle:
get_resource: broker_wait_handle
@ -273,7 +273,7 @@ resources:
node_wait_condition:
type: AWS::CloudFormation::WaitCondition
DependsOn: node_instance
depends_on: node_instance
properties:
Handle:
get_resource: node_wait_handle

8
openshift-enterprise/heat/neutron/highly-available/ose_ha_stack.yaml
View File

@ -58,10 +58,10 @@ parameters:
description: Name of an existing keypair to enable SSH access to the instances
type: string
domain:
Description: Your DNS domain
description: Your DNS domain
type: string
hosts_domain:
Description: Openshift hosts domain
description: Openshift hosts domain
type: string
broker_server_flavor:
description: Flavor of broker server
@ -245,7 +245,7 @@ parameters:
resources:
ose_broker_sec_grp:
type: AWS::EC2::SecurityGroup
Properties:
properties:
GroupDescription: broker firewall rules
VpcId: { get_param: private_net_id }
SecurityGroupIngress:
@ -387,7 +387,7 @@ resources:
###
broker1_instance:
type: OS::Nova::Server
DependsOn: broker_wait_condition
depends_on: broker_wait_condition
properties:
name: ose_broker1
image: { get_param: broker_image }

6
openshift-enterprise/heat/neutron/highly-available/ose_node_stack.yaml
View File

@ -48,10 +48,10 @@ parameters:
description: Name of an existing keypair to enable SSH access to the instances
type: string
domain:
Description: Your DNS domain
description: Your DNS domain
type: string
hosts_domain:
Description: Openshift hosts domain
description: Openshift hosts domain
type: string
avail_zone:
description: >
@ -193,7 +193,7 @@ parameters:
resources:
ose_node_sec_grp:
type: AWS::EC2::SecurityGroup
Properties:
properties:
GroupDescription: Node firewall rules
VpcId: { get_param: private_net_id }
SecurityGroupIngress: