From 768e19b313e1d45560fd37b967756b452b6b0b08 Mon Sep 17 00:00:00 2001
From: Cedric Brandily <zzelle@gmail.com>
Date: Fri, 27 Mar 2015 10:54:34 +0100
Subject: [PATCH] WaitCondition timeout attribute should be a number

According to Heat documentation, AWS::CloudFormation::WaitCondition
timeout attribute should be a number but magnum templates use strings:

  master_wait_condition:
    type: "AWS::CloudFormation::WaitCondition"
    properties:
      Handle:
        get_resource: master_wait_handle
      Timeout: "6000"

This change replaces string timeouts ("6000") by number timeout (6000).

Change-Id: I2ad6825899dca551a152c101832c2d38c61a113e
Closes-Bug: #1437234
---
 magnum/templates/docker-swarm/swarm.yaml                     | 2 +-
 magnum/templates/docker-swarm/swarmnode.yaml                 | 2 +-
 magnum/templates/heat-kubernetes/kubecluster-coreos.yaml     | 2 +-
 magnum/templates/heat-kubernetes/kubecluster.yaml            | 2 +-
 magnum/templates/heat-kubernetes/kubenode-coreos.yaml        | 2 +-
 magnum/templates/heat-kubernetes/kubenode-fedora-ironic.yaml | 2 +-
 magnum/templates/heat-kubernetes/kubenode.yaml               | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/magnum/templates/docker-swarm/swarm.yaml b/magnum/templates/docker-swarm/swarm.yaml
index 26acf6a05a..34615d9fd0 100644
--- a/magnum/templates/docker-swarm/swarm.yaml
+++ b/magnum/templates/docker-swarm/swarm.yaml
@@ -65,7 +65,7 @@ resources:
     properties:
       Handle:
         get_resource: master_wait_handle
-      Timeout: "6000"
+      Timeout: 6000
 
   ######################################################################
   #
diff --git a/magnum/templates/docker-swarm/swarmnode.yaml b/magnum/templates/docker-swarm/swarmnode.yaml
index e043ff66d3..6d6ef4a696 100644
--- a/magnum/templates/docker-swarm/swarmnode.yaml
+++ b/magnum/templates/docker-swarm/swarmnode.yaml
@@ -50,7 +50,7 @@ resources:
     properties:
       Handle:
         get_resource: node_wait_handle
-      Timeout: "6000"
+      Timeout: 6000
 
   ######################################################################
   #
diff --git a/magnum/templates/heat-kubernetes/kubecluster-coreos.yaml b/magnum/templates/heat-kubernetes/kubecluster-coreos.yaml
index 5ec4aa5289..e9741bc5e4 100644
--- a/magnum/templates/heat-kubernetes/kubecluster-coreos.yaml
+++ b/magnum/templates/heat-kubernetes/kubecluster-coreos.yaml
@@ -106,7 +106,7 @@ resources:
     properties:
       Handle:
         get_resource: master_wait_handle
-      Timeout: "6000"
+      Timeout: 6000
 
   ######################################################################
   #
diff --git a/magnum/templates/heat-kubernetes/kubecluster.yaml b/magnum/templates/heat-kubernetes/kubecluster.yaml
index 9199df5163..a90481c937 100644
--- a/magnum/templates/heat-kubernetes/kubecluster.yaml
+++ b/magnum/templates/heat-kubernetes/kubecluster.yaml
@@ -103,7 +103,7 @@ resources:
     properties:
       Handle:
         get_resource: master_wait_handle
-      Timeout: "6000"
+      Timeout: 6000
 
   ######################################################################
   #
diff --git a/magnum/templates/heat-kubernetes/kubenode-coreos.yaml b/magnum/templates/heat-kubernetes/kubenode-coreos.yaml
index b8aa89f826..a186f6fe37 100644
--- a/magnum/templates/heat-kubernetes/kubenode-coreos.yaml
+++ b/magnum/templates/heat-kubernetes/kubenode-coreos.yaml
@@ -72,7 +72,7 @@ resources:
     properties:
       Handle:
         get_resource: node_wait_handle
-      Timeout: "6000"
+      Timeout: 6000
 
   ######################################################################
   #
diff --git a/magnum/templates/heat-kubernetes/kubenode-fedora-ironic.yaml b/magnum/templates/heat-kubernetes/kubenode-fedora-ironic.yaml
index 5fff0f25ad..d0017fa3c2 100644
--- a/magnum/templates/heat-kubernetes/kubenode-fedora-ironic.yaml
+++ b/magnum/templates/heat-kubernetes/kubenode-fedora-ironic.yaml
@@ -54,7 +54,7 @@ resources:
     properties:
       Handle:
         get_resource: node_wait_handle
-      Timeout: "6000"
+      Timeout: 6000
 
   ######################################################################
   #
diff --git a/magnum/templates/heat-kubernetes/kubenode.yaml b/magnum/templates/heat-kubernetes/kubenode.yaml
index 17de6f9fb3..1623a5f4ba 100644
--- a/magnum/templates/heat-kubernetes/kubenode.yaml
+++ b/magnum/templates/heat-kubernetes/kubenode.yaml
@@ -64,7 +64,7 @@ resources:
     properties:
       Handle:
         get_resource: node_wait_handle
-      Timeout: "6000"
+      Timeout: 6000
 
   ######################################################################
   #