From a5b325551de1ed478e00c40bf339d14bb11a1d1a Mon Sep 17 00:00:00 2001
From: Thomas Herve <thomas.herve@enovance.com>
Date: Thu, 27 Mar 2014 16:08:44 +0100
Subject: [PATCH] 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
---
 hot/F18/WordPress_NoKey.yaml                              | 2 +-
 hot/swift.yaml                                            | 2 +-
 .../heat/neutron/OpenShift-1B1N-neutron.yaml              | 4 ++--
 .../heat/neutron/highly-available/ose_ha_stack.yaml       | 8 ++++----
 .../heat/neutron/highly-available/ose_node_stack.yaml     | 6 +++---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/hot/F18/WordPress_NoKey.yaml b/hot/F18/WordPress_NoKey.yaml
index c0f24f7b..46da4553 100644
--- a/hot/F18/WordPress_NoKey.yaml
+++ b/hot/F18/WordPress_NoKey.yaml
@@ -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:
diff --git a/hot/swift.yaml b/hot/swift.yaml
index 60684add..53ceefb6 100644
--- a/hot/swift.yaml
+++ b/hot/swift.yaml
@@ -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:*"
diff --git a/openshift-enterprise/heat/neutron/OpenShift-1B1N-neutron.yaml b/openshift-enterprise/heat/neutron/OpenShift-1B1N-neutron.yaml
index 58f43fb8..d62a08c0 100644
--- a/openshift-enterprise/heat/neutron/OpenShift-1B1N-neutron.yaml
+++ b/openshift-enterprise/heat/neutron/OpenShift-1B1N-neutron.yaml
@@ -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
diff --git a/openshift-enterprise/heat/neutron/highly-available/ose_ha_stack.yaml b/openshift-enterprise/heat/neutron/highly-available/ose_ha_stack.yaml
index c0f62ee0..540e76ab 100644
--- a/openshift-enterprise/heat/neutron/highly-available/ose_ha_stack.yaml
+++ b/openshift-enterprise/heat/neutron/highly-available/ose_ha_stack.yaml
@@ -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 }
diff --git a/openshift-enterprise/heat/neutron/highly-available/ose_node_stack.yaml b/openshift-enterprise/heat/neutron/highly-available/ose_node_stack.yaml
index 9655e011..33eadb9f 100644
--- a/openshift-enterprise/heat/neutron/highly-available/ose_node_stack.yaml
+++ b/openshift-enterprise/heat/neutron/highly-available/ose_node_stack.yaml
@@ -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: