Skip to content

Commit 88bbf2e

Browse files
authored
Merge branch 'main' into feat/no-cve-2023-41914
2 parents 90a7053 + 44608ac commit 88bbf2e

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

environments/skeleton/{{cookiecutter.environment}}/terraform/nodes.tf

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,6 @@ resource "openstack_compute_instance_v2" "control" {
141141
- [LABEL=home, /exports/home, auto, "x-systemd.required-by=nfs-server.service,x-systemd.before=nfs-server.service"]
142142
EOF
143143

144-
lifecycle{
145-
ignore_changes = [
146-
image_name,
147-
]
148-
}
149-
150144
}
151145

152146
resource "openstack_compute_instance_v2" "login" {
@@ -184,12 +178,6 @@ resource "openstack_compute_instance_v2" "login" {
184178
fqdn: ${var.cluster_name}-${each.key}.${var.cluster_name}.${var.cluster_domain_suffix}
185179
EOF
186180

187-
lifecycle{
188-
ignore_changes = [
189-
image_name,
190-
]
191-
}
192-
193181
}
194182

195183
resource "openstack_compute_instance_v2" "compute" {
@@ -227,10 +215,4 @@ resource "openstack_compute_instance_v2" "compute" {
227215
fqdn: ${var.cluster_name}-${each.key}.${var.cluster_name}.${var.cluster_domain_suffix}
228216
EOF
229217

230-
lifecycle{
231-
ignore_changes = [
232-
image_name,
233-
]
234-
}
235-
236218
}

requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
roles:
33
- src: stackhpc.nfs
4-
version: v22.9.1
4+
version: v23.12.1 # Tolerate state nfs file handles
55
- src: https://github.com/stackhpc/ansible-role-openhpc.git
66
version: v0.23.0 # https://github.com/stackhpc/ansible-role-openhpc/pull/165
77
name: stackhpc.openhpc

0 commit comments

Comments
 (0)