From 1f4188ad79c0212d7bf65b12bd5846c15bb78339 Mon Sep 17 00:00:00 2001
From: Jafar Lie <jafar.lie@monash.edu>
Date: Thu, 5 Mar 2020 10:29:23 +1100
Subject: [PATCH] testing ubuntu mgmt node
---
CICD/heat/gc_HOT.yaml | 20 ++++++++++++++++++--
CICD/heat/resource_registry.yaml | 2 +-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/CICD/heat/gc_HOT.yaml b/CICD/heat/gc_HOT.yaml
index 6c2ad102..8574cbed 100644
--- a/CICD/heat/gc_HOT.yaml
+++ b/CICD/heat/gc_HOT.yaml
@@ -151,10 +151,10 @@ resources:
volume_id: { get_resource: DBVolume }
instance_uuid: { get_resource: SQLNode0 }
- MgmtNodes:
+ MgmtNodesC:
type: "OS::Heat::ResourceGroup"
properties:
- count: 2
+ count: 0
resource_def:
type: My::Server::MgmtNode
properties:
@@ -166,6 +166,22 @@ resources:
ssh_key: { get_param: ssh_key }
security_groups: [ default, { get_resource: SSHMonashSecGroup }, { get_resource: SlurmSecGroup }, { get_resource: NFSSecGroup }, { get_resource: MySQLSecGroup } ]
project_name: { get_param: project_name }
+
+ MgmtNodesU:
+ type: "OS::Heat::ResourceGroup"
+ properties:
+ count: 2
+ resource_def:
+ type: My::Server::MgmtNode
+ properties:
+ #avz: { get_param: avz }
+ image: { get_param: ubuntu_1804_image_id }
+ ansible_ssh_user: ubuntu
+ mynodename:
+ list_join: [ '-', [ { get_param: "OS::stack_name" }, 'mgmt%index%' ]]
+ ssh_key: { get_param: ssh_key }
+ security_groups: [ default, { get_resource: SSHMonashSecGroup }, { get_resource: SlurmSecGroup }, { get_resource: NFSSecGroup }, { get_resource: MySQLSecGroup } ]
+ project_name: { get_param: project_name }
LoginNodesC:
type: "OS::Heat::ResourceGroup"
diff --git a/CICD/heat/resource_registry.yaml b/CICD/heat/resource_registry.yaml
index 0638b887..366990e0 100644
--- a/CICD/heat/resource_registry.yaml
+++ b/CICD/heat/resource_registry.yaml
@@ -1,2 +1,2 @@
resource_registry:
- My::Server::MgmtNode: mgmtnode_HOT.yaml
+ My::Server::MgmtNode: mgmtnode_HOT.yaml
\ No newline at end of file
--
GitLab