From e8d4e597cd3d50f40434386e40209a546d16ec66 Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Tue, 7 Oct 2014 11:23:29 +0100
Subject: [PATCH] a few mods to the templates

Signed-off-by: Arif Ali <mail@arif-ali.co.uk>
---
 heat_templates/compute_node.yaml |  4 ++--
 heat_templates/hpc.yaml          | 27 ++++++++++++++-------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/heat_templates/compute_node.yaml b/heat_templates/compute_node.yaml
index 99813b2..1da90dd 100644
--- a/heat_templates/compute_node.yaml
+++ b/heat_templates/compute_node.yaml
@@ -1,7 +1,7 @@
 heat_template_version: 2014-10-16
 
 description: >
-  HOT template to deploy one compute node into an xisting neutron tenant network and
+  HOT template to deploy one compute node into an existing neutron tenant network and
   assign floating IP address to the server so they are routable from the
   public network.
 
@@ -44,7 +44,7 @@ resources:
     properties:
       Handle:
         get_resource: node_wait_handle
-      Timeout: "300"
+      Timeout: "1200"
 
   secgroup_all_open:
     type: "OS::Neutron::SecurityGroup"
diff --git a/heat_templates/hpc.yaml b/heat_templates/hpc.yaml
index bf7afd7..fd0897e 100644
--- a/heat_templates/hpc.yaml
+++ b/heat_templates/hpc.yaml
@@ -1,9 +1,9 @@
 heat_template_version: 2014-10-16
 
 description: >
-  This template will boot a Kubernetes cluster with one or more
-  minions (as specified by the number_of_minions parameter, which
-  defaults to "2").
+  This template will boot a HPC cluster with one or more compute
+  nodes (as specified by the number_of_compute_nodes parameter, which
+  defaults to "10").
 
 parameters:
 
@@ -16,12 +16,6 @@ parameters:
   public_net_id:
     type: string
     description: uuid of a network to use for floating ip addresses
-  #private_net_id:
-  #  type: string
-  #  description: uuid of a network to use for floating ip addresses
-  #private_subnet_id:
-  #  type: string
-  #  description: uuid of a network to use for floating ip addresses
 
   #
   # OPTIONAL PARAMETERS
@@ -35,16 +29,19 @@ parameters:
     type: string
     default: m1.small
     description: flavor to use when booting the server
+    constraints:
+      - allowed_values: [m1.tiny, m1.small, m1.large]
+        description: Value must be one of 'm1.tiny', 'm1.small' or 'm1.large'
 
   dns_nameserver:
     type: string
-    description: address of a dns nameserver reachable in your environment
     default: 8.8.8.8
+    description: address of a dns nameserver reachable in your environment
 
   number_of_compute_nodes:
     type: string
-    description: how many compute nodes to spawn
     default: 10
+    description: how many compute nodes to spawn
 
 resources:
 
@@ -58,7 +55,7 @@ resources:
     properties:
       Handle:
         get_resource: master_wait_handle
-      Timeout: "300"
+      Timeout: "1200"
 
   ######################################################################
   #
@@ -123,7 +120,7 @@ resources:
 
   ######################################################################
   #
-  # databases server.  this sets up a MySQL server
+  # master_node server.  this sets up a Master Node
   #
   master_node:
     type: "OS::Nova::Server"
@@ -200,6 +197,10 @@ resources:
       port_id:
         get_resource: master_node_eth0
 
+  ######################################################################
+  #
+  # compute_node server.  this sets up the Compute Nodes
+  #
   compute_nodes:
     type: "OS::Heat::ResourceGroup"
     depends_on: