From 7b71efa68d016b85bda712397b64ca9bd0a20450 Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Fri, 24 Apr 2020 00:47:58 +0000
Subject: [PATCH] security group update and removal of run_once
---
CICD/heat/gc_secgroups.hot | 9 ++++++---
roles/slurm-common/tasks/createSlurmDirectories.yml | 1 -
roles/slurm-start/tasks/main.yml | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CICD/heat/gc_secgroups.hot b/CICD/heat/gc_secgroups.hot
index ad6e7790..fe7d4b35 100644
--- a/CICD/heat/gc_secgroups.hot
+++ b/CICD/heat/gc_secgroups.hot
@@ -10,13 +10,16 @@ resources:
name: "heatslurmsecgroup"
rules: [ { protocol: tcp,
port_range_min: 12000,
- port_range_max: 12999},
+ port_range_max: 12999,
+ remote_mode: "remote_group_id"},
{ protocol: tcp,
port_range_min: 6817,
- port_range_max: 6819},
+ port_range_max: 6819,
+ remote_mode: "remote_group_id"},
{ protocol: tcp,
port_range_min: 1019,
- port_range_max: 1019}]
+ port_range_max: 1019,
+ remote_mode: "remote_group_id"}]
NFSSecGroup:
type: "OS::Neutron::SecurityGroup"
properties:
diff --git a/roles/slurm-common/tasks/createSlurmDirectories.yml b/roles/slurm-common/tasks/createSlurmDirectories.yml
index 73895682..ba82cd78 100644
--- a/roles/slurm-common/tasks/createSlurmDirectories.yml
+++ b/roles/slurm-common/tasks/createSlurmDirectories.yml
@@ -42,7 +42,6 @@
- name: create shared state directory
file: path={{slurmsharedstatedir }} state=directory owner=slurm group=slurm mode=750
become: true
- run_once: true
when: usesharedstatedir is defined and usesharedstatedir
- name: symlink shared state dir
diff --git a/roles/slurm-start/tasks/main.yml b/roles/slurm-start/tasks/main.yml
index c30074e7..678de3d5 100644
--- a/roles/slurm-start/tasks/main.yml
+++ b/roles/slurm-start/tasks/main.yml
@@ -60,6 +60,7 @@
shell: "{{slurm_dir}}/bin/sacctmgr show cluster -p | wc -l"
register: slurm_cluster_count
check_mode: no
+ changed_when: false
- debug:
var: slurm_cluster_count
--
GitLab