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

merge conflict resolved

parent 92b681ca
No related branches found
No related tags found
1 merge request!297Cicd merge back
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 4 deletions
CICD/heat/gc_HOT.yaml
+ 0
− 4
View file @ 7896cdd4
...@@ -104,11 +104,7 @@ resources: ...@@ -104,11 +104,7 @@ resources:
name: name:
list_join: [ '-', [ { get_param: "OS::stack_name" }, 'sql0' ]] list_join: [ '-', [ { get_param: "OS::stack_name" }, 'sql0' ]]
availability_zone: { get_param: avz } availability_zone: { get_param: avz }
<<<<<<< HEAD
flavor: m3.xsmall flavor: m3.xsmall
=======
flavor: m3.small
>>>>>>> a64ba97998b3abad991dce401da622d28c1802dd
image: { get_param: centos_7_image_id } image: { get_param: centos_7_image_id }
key_name: { get_param: ssh_key } key_name: { get_param: ssh_key }
security_groups: [ { get_resource: SSHMonashSecGroup }, { get_resource: SlurmSecGroup }, { get_resource: MySQLSecGroup }, { get_resource: NFSSecGroup } ] security_groups: [ { get_resource: SSHMonashSecGroup }, { get_resource: SlurmSecGroup }, { get_resource: MySQLSecGroup }, { get_resource: NFSSecGroup } ]
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment