@@ -340,33 +340,19 @@ resource "openstack_compute_instance_v2" "computes" {
340
340
341
341
# --- floating ips ---
342
342
343
- resource "openstack_networking_floatingip_v2" "logins" {
344
-
345
- for_each = var. login_names
346
-
347
- pool = data. openstack_networking_network_v2 . external . name
348
- address = var. login_ips [each . key ]
349
- }
350
-
351
343
resource "openstack_compute_floatingip_associate_v2" "logins" {
352
344
for_each = var. login_names
353
345
354
- floating_ip = openstack_networking_floatingip_v2 . logins [each . key ]. address
346
+ floating_ip = var . login_ips [each . key ]
355
347
instance_id = openstack_compute_instance_v2. logins [each . key ]. id
356
348
# networks are zero-indexed
357
349
fixed_ip = openstack_compute_instance_v2. logins [each . key ]. network . 2 . fixed_ip_v4
358
350
359
351
}
360
352
361
- resource "openstack_networking_floatingip_v2" "control" {
362
-
363
- pool = data. openstack_networking_network_v2 . external . name
364
- address = var. control_ip
365
- }
366
-
367
353
resource "openstack_compute_floatingip_associate_v2" "control" {
368
354
369
- floating_ip = openstack_networking_floatingip_v2 . control . address
355
+ floating_ip = var . control_ip
370
356
instance_id = openstack_compute_instance_v2. control . id
371
357
# networks are zero-indexed
372
358
fixed_ip = openstack_compute_instance_v2. control . network . 2 . fixed_ip_v4
@@ -380,7 +366,7 @@ resource "local_file" "hosts" {
380
366
{
381
367
" cluster_name" : var.cluster_name
382
368
" cluster_slurm_name" : var.cluster_slurm_name
383
- " proxy_fip" : openstack_networking_floatingip_v2.logins [var.proxy_name].address
369
+ " proxy_fip" : var.login_ips [var.proxy_name]
384
370
" control" : openstack_compute_instance_v2.control,
385
371
" logins" : openstack_compute_instance_v2.logins,
386
372
" computes" : openstack_compute_instance_v2.computes,
0 commit comments