Skip to content
Snippets Groups Projects
Commit 922e711e authored by František Dvořák's avatar František Dvořák
Browse files

Migration of EOSC testing instance to the new OpenStack

* update flavor names
* update network names
* disable IPv6
* update inventory
parent fdc69c6e
No related branches found
No related tags found
No related merge requests found
--- ---
fip: fip:
hosts: hosts:
147.251.124.105: 147.251.245.238:
master: master:
hosts: hosts:
2001:718:801:432:f816:3eff:fe36:5620: 192.168.0.80:
# must be IPv4 address or hostname # must be IPv4 address or hostname
kube_server: 192.168.0.115 kube_server: 192.168.0.80
ingress: ingress:
hosts: hosts:
2001:718:801:432:f816:3eff:fe41:a4b4: 192.168.0.156:
nfs: nfs:
hosts: hosts:
2001:718:801:432:f816:3eff:fee1:9385: 192.168.0.160:
worker: worker:
hosts: hosts:
2001:718:801:432:f816:3eff:fef7:c707: 192.168.0.131:
gpu: gpu:
hosts: hosts:
2001:718:801:432:f816:3eff:fe60:acb6: 192.168.0.186:
# using public IP of kube_server for ansible delegate_to # using public IP of kube_server for ansible delegate_to
kube_server: kube_server:
hosts: hosts:
192.168.0.115: 192.168.0.80:
ansible_host: 2001:718:801:432:f816:3eff:fe36:5620 ansible_host: 192.168.0.80
...@@ -11,6 +11,10 @@ all: ...@@ -11,6 +11,10 @@ all:
vars: vars:
ansible_become: true ansible_become: true
ansible_user: egi 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 site_name: cesnet-testing
vault_mount_point: secrets/users/e1662e20-e34b-468c-b0ce-d899bc878364@egi.eu/eosc-testing vault_mount_point: secrets/users/e1662e20-e34b-468c-b0ce-d899bc878364@egi.eu/eosc-testing
......
../../../../common/playbooks/templates/etc/exports.ipv46 ../../../../common/playbooks/templates/etc/exports.ipv4
\ No newline at end of file \ No newline at end of file
# These need to be defined for things to work # 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" net_name = "group-project-network"
net6_name = "public-muni-v6-432" net6_name = "external-ipv6-general-public"
site_name = "testing" site_name = "testing"
# These may need some adjustment for your provider # These may need some adjustment for your provider
master_flavor_name = "standard.medium" master_flavor_name = "e1.small"
worker_flavor_name = "standard.large" worker_flavor_name = "e1.large"
gpu_flavor_name = "a3.32core-240ram-1t4" gpu_flavor_name = "a3.30core-240ram-nvidia-t4"
# Number of extra workers # Number of extra workers
extra_workers = 1 extra_workers = 1
......
...@@ -3,11 +3,11 @@ locals { ...@@ -3,11 +3,11 @@ locals {
openstack_compute_instance_v2.ingress, openstack_compute_instance_v2.ingress,
openstack_compute_instance_v2.nfs, openstack_compute_instance_v2.nfs,
], openstack_compute_instance_v2.worker[*], openstack_compute_instance_v2.gpu[*]) ], openstack_compute_instance_v2.worker[*], openstack_compute_instance_v2.gpu[*])
master_ip = replace(openstack_compute_instance_v2.master.network[1].fixed_ip_v6, "/\\[(.*)\\]/", "$1") master_ip = openstack_compute_instance_v2.master.network[0].fixed_ip_v4
ingress_ip = replace(openstack_compute_instance_v2.ingress.network[1].fixed_ip_v6, "/\\[(.*)\\]/", "$1") ingress_ip = openstack_compute_instance_v2.ingress.network[0].fixed_ip_v4
nfs_ip = replace(openstack_compute_instance_v2.nfs.network[1].fixed_ip_v6, "/\\[(.*)\\]/", "$1") nfs_ip = openstack_compute_instance_v2.nfs.network[0].fixed_ip_v4
worker_ips = [for s in openstack_compute_instance_v2.worker[*].network[1].fixed_ip_v6 : replace(s, "/\\[(.*)\\]/", "$1")] 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[1].fixed_ip_v6 : replace(s, "/\\[(.*)\\]/", "$1")] gpu_ips = [for s in openstack_compute_instance_v2.gpu[*].network[0].fixed_ip_v4 : s]
} }
resource "openstack_networking_floatingip_v2" "public_ip" { resource "openstack_networking_floatingip_v2" "public_ip" {
...@@ -40,9 +40,6 @@ resource "openstack_compute_instance_v2" "master" { ...@@ -40,9 +40,6 @@ resource "openstack_compute_instance_v2" "master" {
network { network {
name = var.net_name name = var.net_name
} }
network {
name = var.net6_name
}
} }
resource "openstack_compute_instance_v2" "nfs" { resource "openstack_compute_instance_v2" "nfs" {
...@@ -55,9 +52,6 @@ resource "openstack_compute_instance_v2" "nfs" { ...@@ -55,9 +52,6 @@ resource "openstack_compute_instance_v2" "nfs" {
network { network {
name = var.net_name name = var.net_name
} }
network {
name = var.net6_name
}
} }
resource "openstack_compute_instance_v2" "ingress" { resource "openstack_compute_instance_v2" "ingress" {
...@@ -70,9 +64,6 @@ resource "openstack_compute_instance_v2" "ingress" { ...@@ -70,9 +64,6 @@ resource "openstack_compute_instance_v2" "ingress" {
network { network {
name = var.net_name name = var.net_name
} }
network {
name = var.net6_name
}
} }
resource "openstack_compute_instance_v2" "worker" { resource "openstack_compute_instance_v2" "worker" {
...@@ -86,9 +77,6 @@ resource "openstack_compute_instance_v2" "worker" { ...@@ -86,9 +77,6 @@ resource "openstack_compute_instance_v2" "worker" {
network { network {
name = var.net_name name = var.net_name
} }
network {
name = var.net6_name
}
} }
resource "openstack_compute_instance_v2" "gpu" { resource "openstack_compute_instance_v2" "gpu" {
...@@ -102,9 +90,6 @@ resource "openstack_compute_instance_v2" "gpu" { ...@@ -102,9 +90,6 @@ resource "openstack_compute_instance_v2" "gpu" {
network { network {
name = var.net_name name = var.net_name
} }
network {
name = var.net6_name
}
} }
resource "openstack_compute_floatingip_associate_v2" "fip" { resource "openstack_compute_floatingip_associate_v2" "fip" {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment