diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 354bef662f796db607f7c07b75c4907d7d5026fe..442dbd54e3aa0ca3c96801ad989feb81be21b23c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -173,7 +173,8 @@ tests: - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "/opt/slurm-latest/bin/sinfo" ManagementNodes - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "/opt/slurm-latest/bin/squeue" ManagementNodes - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "/opt/slurm-latest/bin/scontrol ping" LoginNodes - - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet ntpd" all + - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet ntpd" CentosNodes + - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet ntp" UbuntuNodes - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet mariadb" SQLNodes - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet slurmctld" ManagementNodes - ansible -B 30 -i files/inventory.$STACKNAME --key-file ../gc_key.pem -a "systemctl is-active --quiet slurmdbd" ManagementNodes diff --git a/CICD/heat/gc_HOT.yaml b/CICD/heat/gc_HOT.yaml index cf4fcc891d42fd0d985a18c3202b8a411f905714..6137bbedd1c7bae184cf91bee74b0e5e3c77cb8e 100644 --- a/CICD/heat/gc_HOT.yaml +++ b/CICD/heat/gc_HOT.yaml @@ -77,7 +77,7 @@ resources: key_name: { get_param: ssh_key } security_groups: [ { get_param: SSHMonashSecGroupID }, { get_param: SlurmSecGroupID }, { get_param: MySQLSecGroupID }, { get_param: NFSSecGroupID }, { get_param: LDAPSecGroupID } ] metadata: - ansible_host_groups: [ SQLNodes, NFSNodes, LDAPServer ] + ansible_host_groups: [ SQLNodes, NFSNodes, LDAPServer, CentosNodes ] ansible_ssh_user: ec2-user project_name: { get_param: project_name } networks: @@ -129,6 +129,7 @@ resources: #avz: { get_param: avz } image: { get_param: centos_7_image_id } ansible_ssh_user: ec2-user + ansible_host_groups: [ ManagementNodes, CentosNodes ] mynodename: list_join: [ '-', [ { get_param: "OS::stack_name" }, 'mgmt%index%' ]] ssh_key: { get_param: ssh_key } @@ -145,6 +146,7 @@ resources: #avz: { get_param: avz } image: { get_param: ubuntu_1804_image_id } ansible_ssh_user: ubuntu + ansible_host_groups: [ ManagementNodes, UbuntuNodes ] mynodename: list_join: [ '-', [ { get_param: "OS::stack_name" }, 'mgmtU%index%' ]] ssh_key: { get_param: ssh_key } @@ -166,7 +168,7 @@ resources: list_join: [ '-', [ { get_param: "OS::stack_name" }, 'login%index%' ]] security_groups: [ default, { get_param: PublicSSHSecGroupID }, { get_param: SlurmSecGroupID }, { get_param: NFSSecGroupID }, { get_param: LDAPSecGroupID } ] metadata: - ansible_host_groups: [ LoginNodes ] + ansible_host_groups: [ LoginNodes, CentosNodes ] ansible_ssh_user: ec2-user project_name: { get_param: project_name } networks: @@ -187,7 +189,7 @@ resources: list_join: [ '-', [ { get_param: "OS::stack_name" }, 'loginU%index%' ]] security_groups: [ default, { get_param: SSHMonashSecGroupID }, { get_param: SlurmSecGroupID }, { get_param: NFSSecGroupID }, { get_param: LDAPSecGroupID } ] metadata: - ansible_host_groups: [ LoginNodes ] + ansible_host_groups: [ LoginNodes, UbuntuNodes ] ansible_ssh_user: ubuntu project_name: { get_param: project_name } networks: @@ -208,7 +210,7 @@ resources: list_join: [ '-', [ { get_param: "OS::stack_name" }, 'desktopc%index%' ]] security_groups: [ default, { get_param: SSHMonashSecGroupID }, { get_param: SlurmSecGroupID }, { get_param: NFSSecGroupID }, { get_param: LDAPSecGroupID } ] metadata: - ansible_host_groups: [ DesktopNodes, VisNodes, ComputeNodes ] + ansible_host_groups: [ DesktopNodes, VisNodes, ComputeNodes, CentosNodes ] ansible_ssh_user: ec2-user project_name: { get_param: project_name } networks: @@ -229,7 +231,7 @@ resources: list_join: [ '-', [ { get_param: "OS::stack_name" }, 'computeU%index%' ]] security_groups: [ default, { get_param: SlurmSecGroupID }, { get_param: NFSSecGroupID }, { get_param: SSHMonashSecGroupID }, { get_param: LDAPSecGroupID } ] metadata: - ansible_host_groups: [ ComputeNodes ] + ansible_host_groups: [ ComputeNodes, UbuntuNodes ] ansible_ssh_user: ubuntu project_name: { get_param: project_name } networks: @@ -250,7 +252,7 @@ resources: list_join: [ '-', [ { get_param: "OS::stack_name" }, 'computec7%index%' ]] security_groups: [ default, { get_param: SSHMonashSecGroupID }, { get_param: SlurmSecGroupID }, { get_param: NFSSecGroupID }, { get_param: LDAPSecGroupID } ] metadata: - ansible_host_groups: [ ComputeNodes ] + ansible_host_groups: [ ComputeNodes, CentosNodes ] ansible_ssh_user: ec2-user project_name: { get_param: project_name } networks: @@ -271,7 +273,7 @@ resources: list_join: [ '-', [ { get_param: "OS::stack_name" }, 'gpudesktopu%index%' ]] security_groups: [ default, { get_param: SSHMonashSecGroupID }, { get_param: SlurmSecGroupID }, { get_param: NFSSecGroupID }, { get_param: LDAPSecGroupID } ] metadata: - ansible_host_groups: [ DesktopNodes, GPU, ComputeNodes, VisNodes ] + ansible_host_groups: [ DesktopNodes, GPU, ComputeNodes, VisNodes, UbuntuNodes ] ansible_ssh_user: ubuntu project_name: { get_param: project_name } networks: @@ -292,7 +294,7 @@ resources: list_join: [ '-', [ { get_param: "OS::stack_name" }, 'gpudesktopc%index%' ]] security_groups: [ default, { get_param: SSHMonashSecGroupID }, { get_param: SlurmSecGroupID }, { get_param: NFSSecGroupID } ] metadata: - ansible_host_groups: [ DesktopNodes, GPU, ComputeNodes, K1, VisNodes ] + ansible_host_groups: [ DesktopNodes, GPU, ComputeNodes, K1, VisNodes, CentosNodes ] ansible_ssh_user: ec2-user project_name: { get_param: project_name } networks: @@ -313,25 +315,8 @@ resources: list_join: [ '-', [ { get_param: "OS::stack_name" }, 'computerhel%index%' ]] security_groups: [ default, { get_param: SSHMonashSecGroupID }, { get_param: SlurmSecGroupID }, { get_param: NFSSecGroupID }, { get_param: LDAPSecGroupID } ] metadata: - ansible_host_groups: [ DGXRHELNodes ] + ansible_host_groups: [ DGXRHELNodes, RedhatNodes ] ansible_ssh_user: cloud-user project_name: { get_param: project_name } networks: - network: { get_param: NetID } - -# PySSHauthz: -# type: "OS::Nova::Server" -# properties: -# name: -# list_join: [ '-', [ { get_param: "OS::stack_name" }, 'pysshautz' ]] -# availability_zone: { get_param: avz } -# flavor: m3.xsmall -# image: { get_param: ubuntu_1804_image_id } -# key_name: { get_param: ssh_key } -# security_groups: [ { get_resource_id SSHMonashSecGroup }, { get_resource_id webaccess }, { get_param: LDAPSecGroupID } ] -# metadata: -# ansible_host_groups: [ PySSHauthz ] -# ansible_ssh_user: ubuntu -# project_name: { get_param: project_name } -# networks: -# - network: { get_param: NetID } diff --git a/CICD/heat/mgmtnode_HOT.yaml b/CICD/heat/mgmtnode_HOT.yaml index d44cf911c1dcc0909330d6f9455500fc28b6ec88..85bceab9f6b2db7373a40e85038f4e681691def0 100644 --- a/CICD/heat/mgmtnode_HOT.yaml +++ b/CICD/heat/mgmtnode_HOT.yaml @@ -16,8 +16,10 @@ parameters: type: json NetID: type: string - #default: 915a3d96-693d-4c9d-a2ef-04996ab085d3 default: Classic Provider + ansible_host_groups: + type: comma_delimited_list + default: [ ManagementNodes ] resources: @@ -31,7 +33,7 @@ resources: security_groups: { get_param: security_groups } name: { get_param: mynodename } metadata: - ansible_host_groups: [ ManagementNodes ] + ansible_host_groups: { get_param: ansible_host_groups } ansible_ssh_user: { get_param: ansible_ssh_user } project_name: { get_param: project_name } networks: