diff --git a/eosc-testing/inventory/1-cesnet.yaml b/eosc-testing/inventory/1-cesnet.yaml
index f82c2f0adc040f7528f717c887a4665dcb44993a..43f7d197cc833427a3868903421fbde866a6106a 100644
--- a/eosc-testing/inventory/1-cesnet.yaml
+++ b/eosc-testing/inventory/1-cesnet.yaml
@@ -1,32 +1,32 @@
---
fip:
hosts:
- 147.251.124.105:
+ 147.251.245.238:
master:
hosts:
- 2001:718:801:432:f816:3eff:fe36:5620:
+ 192.168.0.80:
# must be IPv4 address or hostname
- kube_server: 192.168.0.115
+ kube_server: 192.168.0.80
ingress:
hosts:
- 2001:718:801:432:f816:3eff:fe41:a4b4:
+ 192.168.0.156:
nfs:
hosts:
- 2001:718:801:432:f816:3eff:fee1:9385:
+ 192.168.0.160:
worker:
hosts:
- 2001:718:801:432:f816:3eff:fef7:c707:
+ 192.168.0.131:
gpu:
hosts:
- 2001:718:801:432:f816:3eff:fe60:acb6:
+ 192.168.0.186:
# using public IP of kube_server for ansible delegate_to
kube_server:
hosts:
- 192.168.0.115:
- ansible_host: 2001:718:801:432:f816:3eff:fe36:5620
+ 192.168.0.80:
+ ansible_host: 192.168.0.80
diff --git a/eosc-testing/inventory/99-all.yaml b/eosc-testing/inventory/99-all.yaml
index 438f7685ad56b3ab73bb6fffb0db05909e8e7fab..b85113e757e74a5db88122f3868baf8aa363e591 100644
--- a/eosc-testing/inventory/99-all.yaml
+++ b/eosc-testing/inventory/99-all.yaml
@@ -11,6 +11,10 @@ all:
vars:
ansible_become: true
ansible_user: egi
+ ansible_ssh_common_args: >-
+ -o ProxyCommand="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -W %h:%p -q egi@{{ groups["fip"][0] }}"
+ -o StrictHostKeyChecking=no
+ -o UserKnownHostsFile=/dev/null
site_name: cesnet-testing
vault_mount_point: secrets/users/e1662e20-e34b-468c-b0ce-d899bc878364@egi.eu/eosc-testing
diff --git a/eosc-testing/playbooks/templates/etc/exports b/eosc-testing/playbooks/templates/etc/exports
index 3ef288e7f957972605d82cccffdb528b3992e2d7..a743a02371266dc407172d7218cbce75da927810 120000
--- a/eosc-testing/playbooks/templates/etc/exports
+++ b/eosc-testing/playbooks/templates/etc/exports
@@ -1 +1 @@
-../../../../common/playbooks/templates/etc/exports.ipv46
\ No newline at end of file
+../../../../common/playbooks/templates/etc/exports.ipv4
\ No newline at end of file
diff --git a/eosc-testing/terraform/terraform.tfvars b/eosc-testing/terraform/terraform.tfvars
index 13dcf0df794b563fe29e24d12113f128144b00ec..4aaf5281eae1813c1417581db77f50841bb3889c 100644
--- a/eosc-testing/terraform/terraform.tfvars
+++ b/eosc-testing/terraform/terraform.tfvars
@@ -1,13 +1,13 @@
# These need to be defined for things to work
-ip_pool = "public-muni-147-251-124-GROUP"
+ip_pool = "external-ipv4-general-public"
net_name = "group-project-network"
-net6_name = "public-muni-v6-432"
+net6_name = "external-ipv6-general-public"
site_name = "testing"
# These may need some adjustment for your provider
-master_flavor_name = "standard.medium"
-worker_flavor_name = "standard.large"
-gpu_flavor_name = "a3.32core-240ram-1t4"
+master_flavor_name = "e1.small"
+worker_flavor_name = "e1.large"
+gpu_flavor_name = "a3.30core-240ram-nvidia-t4"
# Number of extra workers
extra_workers = 1
diff --git a/eosc-testing/terraform/vms.tf b/eosc-testing/terraform/vms.tf
index d4d208bc2de5d24b76455f9b07fdc185f04a21c8..5cf7c5b379ec1c194ddcdc5915034f08ce2a88cc 100644
--- a/eosc-testing/terraform/vms.tf
+++ b/eosc-testing/terraform/vms.tf
@@ -3,11 +3,11 @@ locals {
openstack_compute_instance_v2.ingress,
openstack_compute_instance_v2.nfs,
], openstack_compute_instance_v2.worker[*], openstack_compute_instance_v2.gpu[*])
- master_ip = replace(openstack_compute_instance_v2.master.network[1].fixed_ip_v6, "/\\[(.*)\\]/", "$1")
- ingress_ip = replace(openstack_compute_instance_v2.ingress.network[1].fixed_ip_v6, "/\\[(.*)\\]/", "$1")
- nfs_ip = replace(openstack_compute_instance_v2.nfs.network[1].fixed_ip_v6, "/\\[(.*)\\]/", "$1")
- worker_ips = [for s in openstack_compute_instance_v2.worker[*].network[1].fixed_ip_v6 : replace(s, "/\\[(.*)\\]/", "$1")]
- gpu_ips = [for s in openstack_compute_instance_v2.gpu[*].network[1].fixed_ip_v6 : replace(s, "/\\[(.*)\\]/", "$1")]
+ master_ip = openstack_compute_instance_v2.master.network[0].fixed_ip_v4
+ ingress_ip = openstack_compute_instance_v2.ingress.network[0].fixed_ip_v4
+ nfs_ip = openstack_compute_instance_v2.nfs.network[0].fixed_ip_v4
+ worker_ips = [for s in openstack_compute_instance_v2.worker[*].network[0].fixed_ip_v4 : s]
+ gpu_ips = [for s in openstack_compute_instance_v2.gpu[*].network[0].fixed_ip_v4 : s]
}
resource "openstack_networking_floatingip_v2" "public_ip" {
@@ -40,9 +40,6 @@ resource "openstack_compute_instance_v2" "master" {
network {
name = var.net_name
}
- network {
- name = var.net6_name
- }
}
resource "openstack_compute_instance_v2" "nfs" {
@@ -55,9 +52,6 @@ resource "openstack_compute_instance_v2" "nfs" {
network {
name = var.net_name
}
- network {
- name = var.net6_name
- }
}
resource "openstack_compute_instance_v2" "ingress" {
@@ -70,9 +64,6 @@ resource "openstack_compute_instance_v2" "ingress" {
network {
name = var.net_name
}
- network {
- name = var.net6_name
- }
}
resource "openstack_compute_instance_v2" "worker" {
@@ -86,9 +77,6 @@ resource "openstack_compute_instance_v2" "worker" {
network {
name = var.net_name
}
- network {
- name = var.net6_name
- }
}
resource "openstack_compute_instance_v2" "gpu" {
@@ -102,9 +90,6 @@ resource "openstack_compute_instance_v2" "gpu" {
network {
name = var.net_name
}
- network {
- name = var.net6_name
- }
}
resource "openstack_compute_floatingip_associate_v2" "fip" {