Skip to content

Commit 03a5598

Browse files
committed
Merge branch 'workflow-cleanup' of github.com:stackhpc/ansible-slurm-appliance into workflow-cleanup
2 parents 52f3e9d + dc1726d commit 03a5598

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

environments/site/tofu/control.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,8 @@ resource "openstack_compute_instance_v2" "control" {
105105
- [LABEL=state, ${var.state_dir}]
106106
%{if var.home_volume_provisioning != "none"}
107107
- [LABEL=home, /exports/home]
108-
%{endif}
108+
%{endif}%{if var.additional_cloud_config != ""}
109109
110-
%{if var.additional_cloud_config != ""}
111110
${templatestring(var.additional_cloud_config, var.additional_cloud_config_vars)}
112111
%{endif}
113112
EOF

environments/site/tofu/node_group/nodes.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ resource "openstack_compute_instance_v2" "compute" {
202202

203203
user_data = <<-EOF
204204
#cloud-config
205-
fqdn: ${local.fqdns[each.key]}
205+
fqdn: ${local.fqdns[each.key]}%{if var.additional_cloud_config != ""}
206+
206207
207-
%{if var.additional_cloud_config != ""}
208208
${templatestring(var.additional_cloud_config, var.additional_cloud_config_vars)}
209209
%{endif}
210210
EOF

0 commit comments

Comments
 (0)