Skip to content
Snippets Groups Projects
Commit ab81b216 authored by Andreas Hamacher's avatar Andreas Hamacher
Browse files

using the m3 flavours

parent 740d7b28
No related branches found
No related tags found
1 merge request!297Cicd merge back
......@@ -13,7 +13,7 @@ parameters:
type: string
label: Image ID
description: Centos Image
default: 12da1997-5122-4be3-a2a9-2f44961c1b16
default: c47c3acb-9657-4243-9e14-e6c676157e3b # with NetworkManager
ssh_key:
type: string
default: gc_key
......@@ -27,7 +27,7 @@ parameters:
default: Classic Provider
Flavour:
type: string
default: t3.xsmall
default: m3.xsmall
resources:
......@@ -104,7 +104,7 @@ resources:
name:
list_join: [ '-', [ { get_param: "OS::stack_name" }, 'sql0' ]]
availability_zone: { get_param: avz }
flavor: t3.small
flavor: m3.xsmall
image: { get_param: centos_7_image_id }
key_name: { get_param: ssh_key }
security_groups: [ { get_resource: SSHMonashSecGroup }, { get_resource: SlurmSecGroup }, { get_resource: MySQLSecGroup }, { get_resource: NFSSecGroup } ]
......@@ -170,12 +170,12 @@ resources:
LoginNodes:
type: "OS::Heat::ResourceGroup"
properties:
count: 1
count: 0
resource_def:
type: "OS::Nova::Server"
properties:
#availability_zone: { get_param: avz }
flavor: t3.small
flavor: m3.xsmall
image: { get_param: centos_7_image_id }
key_name: { get_param: ssh_key }
name:
......@@ -196,7 +196,7 @@ resources:
type: "OS::Nova::Server"
properties:
#availability_zone: { get_param: avz }
flavor: t3.small
flavor: m3.xsmall
image: { get_param: centos_7_image_id }
key_name: { get_param: ssh_key }
name:
......@@ -217,7 +217,7 @@ resources:
type: "OS::Nova::Server"
properties:
#availability_zone: { get_param: avz }
flavor: t3.small
flavor: m3.xsmall
image: { get_param: centos_7_image_id }
key_name: { get_param: ssh_key }
name:
......@@ -238,7 +238,7 @@ resources:
type: "OS::Nova::Server"
properties:
#availability_zone: { get_param: avz }
flavor: t3.small
flavor: m3.xsmall
image: { get_param: ubuntu_1804_image_id }
key_name: { get_param: ssh_key }
name:
......
......@@ -25,7 +25,7 @@ resources:
type: OS::Nova::Server
properties:
#availability_zone: { get_param: avz }
flavor: t3.xsmall
flavor: m3.xsmall
image: { get_param: image }
key_name: { get_param: ssh_key }
security_groups: { get_param: security_groups }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment