Made more things variable.

heat_templates/example_cluster.yml

@@ -16,6 +16,22 @@ parameters:
     type: string
     label: ssh key name.
     description: ssh public key name. (Must be uploaded to openstack first)
+  compute_flavor:
+    type: string
+    label: Flavor for compute nodes,
+    description: Flavor with which to start compute nodes.
+  compute_flavor:
+    type: string
+    label: Flavor for auxiliary nodes.
+    description: Flavor with which to start auxiliary nodes. (for now only the interface machine)
+  cidr:
+    type: string
+    label: Cidr for internal subnet
+    description: Cidr for the subnet of the internal user network.
+  volume_size:
+    type: string
+    label: Size (GB)
+    description: Size (GB) of the volume for each compute node
 
 resources:
   internal_net:
@@ -25,14 +41,14 @@ resources:
     type: OS::Neutron::Subnet
     properties:
       network_id: { get_resource: internal_net }
-      cidr: "192.168.104.0/24"
+      cidr: { get_resource: 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 }
+        external_gateway_info: { get_param: public_net }
 
   internal_interface:
     type: OS::Neutron::RouterInterface
@@ -45,7 +61,7 @@ resources:
     properties:
       key_name: {get_param: ssh_key}
       image: {get_param: image_name}
-      flavor: auxiliary
+      flavor: {get_param: aux_flavor}
       networks:
         - network: internal_net
 
@@ -54,21 +70,21 @@ resources:
     properties:
       key_name: {get_param: ssh_key}
       image: {get_param: image_name}
-      flavor: auxiliary
+      flavor: {get_param: aux_flavor}
       networks:
         - network: internal_net
 
   vcompute01-volume:
     type: OS::Cinder::Volume
     properties:
-      size: 100
+      size: { get_param: volume_size }
 
   vcompute01:
     type: OS::Nova::Server
     properties:
       key_name: adminkey
       image: {get_param: image_name}
-      flavor: Compute
+      flavor: {get_param: compute_flavor}
       networks:
         - network: internal_net
 
@@ -81,14 +97,14 @@ resources:
   vcompute02-volume:
     type: OS::Cinder::Volume
     properties:
-      size: 100
+      size: { get_param: volume_size }
 
   vcompute02:
     type: OS::Nova::Server
     properties:
       key_name: adminkey
       image: {get_param: image_name}
-      flavor: Compute
+      flavor: {get_param: compute_flavor}
       networks:
         - network: internal_net