From 0796ce6311c5c187ee7ff830b4e2cc50795b8ca8 Mon Sep 17 00:00:00 2001
From: Egon Rijpkema <git@egonrijpkema.nl>
Date: Tue, 31 Jul 2018 14:36:15 +0200
Subject: [PATCH] Syntax fixes: launched a cluster..

---
 heat_templates/example_cluster.yml | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/heat_templates/example_cluster.yml b/heat_templates/example_cluster.yml
index c39b555..ef60024 100644
--- a/heat_templates/example_cluster.yml
+++ b/heat_templates/example_cluster.yml
@@ -20,7 +20,7 @@ parameters:
     type: string
     label: Flavor for compute nodes,
     description: Flavor with which to start compute nodes.
-  compute_flavor:
+  aux_flavor:
     type: string
     label: Flavor for auxiliary nodes.
     description: Flavor with which to start auxiliary nodes. (for now only the interface machine)
@@ -28,27 +28,35 @@ parameters:
     type: string
     label: Cidr for internal subnet
     description: Cidr for the subnet of the internal user network.
+  internal_net_name:
+    type: string
+    label: Name for the internal network
+    description: Name for the internal network of this cluster.
   volume_size:
     type: string
     label: Size (GB)
     description: Size (GB) of the volume for each compute node
 
+
+
 resources:
   internal_net:
     type: OS::Neutron::Net
+    properties:
+      name: { get_param: internal_net_name }
 
   internal_subnet:
     type: OS::Neutron::Subnet
     properties:
       network_id: { get_resource: internal_net }
-      cidr: { get_resource: cidr }
+      cidr: { get_param: cidr }
       dns_nameservers: [ "129.125.4.6", "129.125.36.10" ]
       ip_version: 4
 
   internal_router:
     type: OS::Neutron::Router
     properties:
-        external_gateway_info: { network: public_net }
+        external_gateway_info: { network: { get_param: public_net} }
 
   internal_interface:
     type: OS::Neutron::RouterInterface
@@ -63,7 +71,7 @@ resources:
       image: {get_param: image_name}
       flavor: {get_param: aux_flavor}
       networks:
-        - network: internal_net
+        - network: {get_resource: internal_net}
 
   admin:  # Machine to run slurm and other admin tools on.
     type: OS::Nova::Server
@@ -72,12 +80,12 @@ resources:
       image: {get_param: image_name}
       flavor: {get_param: aux_flavor}
       networks:
-        - network: internal_net
+        - network: {get_resource: internal_net}
 
   vcompute01-volume:
     type: OS::Cinder::Volume
     properties:
-      size: { get_param: volume_size }
+      size: {get_param: volume_size}
 
   vcompute01:
     type: OS::Nova::Server
@@ -86,7 +94,7 @@ resources:
       image: {get_param: image_name}
       flavor: {get_param: compute_flavor}
       networks:
-        - network: internal_net
+        - network: {get_resource: internal_net}
 
   volume_attachment:
     type: OS::Cinder::VolumeAttachment
@@ -97,7 +105,7 @@ resources:
   vcompute02-volume:
     type: OS::Cinder::Volume
     properties:
-      size: { get_param: volume_size }
+      size: {get_param: volume_size}
 
   vcompute02:
     type: OS::Nova::Server
@@ -106,7 +114,7 @@ resources:
       image: {get_param: image_name}
       flavor: {get_param: compute_flavor}
       networks:
-        - network: internal_net
+        - network: {get_resource: internal_net}
 
   volume_attachment:
     type: OS::Cinder::VolumeAttachment