mauro.mugnaini
/
infrastructure-as-code
forked from InfraScience/infrastructure-as-code
1
0
Fork 0
Code Pull Requests Activity

Porting changes from upstream #2

Merged
mauro.mugnaini merged 104 commits from InfraScience/infrastructure-as-code:main into main 2024-03-20 12:31:43 +01:00
Conversation 0 Commits 104 Files Changed 152 +62 -10
2 changed files with 62 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3996cd0d54 - Show all commits

11
openstack-tf/d4s-dev/keycloak/main.tf
View File

@ -36,7 +36,7 @@ resource "openstack_compute_servergroup_v2" "keycloak_server_group" {
# Creating object bucket to store avatars # Creating object bucket to store avatars
resource "openstack_objectstorage_container_v1" "keycloak_1" { resource "openstack_objectstorage_container_v1" "keycloak_1" {
name = "keycloak" name = "keycloak"
} }
module "instance_without_data_volume" { module "instance_without_data_volume" {
@ -54,3 +54,12 @@ module "instance_without_data_volume" {
} }
} }
} }
resource "openstack_dns_recordset_v2" "keycloak_dev_dns_recordset" {
zone_id = data.terraform_remote_state.privnet_dns_router.outputs.dns_zone_id
name = join(".", ["accounts"], [data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])
description = "Keycloak d4science dev endpoint"
ttl = 8600
type = "CNAME"
records = [join(".", ["main-lb"], [data.terraform_remote_state.privnet_dns_router.outputs.dns_zone.zone_name])]
}

61
openstack-tf/d4s-dev/keycloak/terraform.tfstate
View File

@ -1,7 +1,7 @@
{ {
"version": 4, "version": 4,
"terraform_version": "1.6.5", "terraform_version": "1.6.6",
"serial": 7, "serial": 9,
"lineage": "2d09d087-e2e3-bb5d-0474-c09dfa4c7145", "lineage": "2d09d087-e2e3-bb5d-0474-c09dfa4c7145",
"outputs": {}, "outputs": {},
"resources": [ "resources": [
@ -86,12 +86,15 @@
"c1_large": "c1.large", "c1_large": "c1.large",
"c1_medium": "c1.medium", "c1_medium": "c1.medium",
"c1_small": "c1.small", "c1_small": "c1.small",
"c2_large": "c2.large",
"m1_large": "m1.large", "m1_large": "m1.large",
"m1_medium": "m1.medium", "m1_medium": "m1.medium",
"m1_xlarge": "m1.xlarge", "m1_xlarge": "m1.xlarge",
"m1_xxl": "m1.xxl",
"m2_large": "m2.large", "m2_large": "m2.large",
"m2_medium": "m2.medium", "m2_medium": "m2.medium",
"m2_small": "m2.small" "m2_small": "m2.small",
"m3_large": "m3.large"
}, },
"floating_ip_pools": { "floating_ip_pools": {
"main_public_ip_pool": "external-network" "main_public_ip_pool": "external-network"
@ -128,6 +131,7 @@
"main_subnet_network_id": "2aa977f2-80b4-447c-a6b0-dfa06bf68751", "main_subnet_network_id": "2aa977f2-80b4-447c-a6b0-dfa06bf68751",
"mtu_size": 8942, "mtu_size": 8942,
"networks_list": { "networks_list": {
"cassandra": "cassandra-net",
"orientdb": "orientdb-net", "orientdb": "orientdb-net",
"orientdb_se": "orientdb-se-net", "orientdb_se": "orientdb-se-net",
"shared_postgresql": "postgresql-srv-net", "shared_postgresql": "postgresql-srv-net",
@ -142,6 +146,7 @@
"isti_net": "146.48.80.0/21", "isti_net": "146.48.80.0/21",
"s2i2s_net": "146.48.28.0/22" "s2i2s_net": "146.48.28.0/22"
}, },
"nfs_share_no_ingress_secgroup_id": "5887da8d-e362-4509-93ac-8a70bf8baef9",
"octavia_information": { "octavia_information": {
"main_lb_description": "Main L4 load balancer for the D4Science DEV", "main_lb_description": "Main L4 load balancer for the D4Science DEV",
"main_lb_hostname": "main-lb", "main_lb_hostname": "main-lb",
@ -161,7 +166,7 @@
"prometheus_server_data": { "prometheus_server_data": {
"flavor": "m1.medium", "flavor": "m1.medium",
"name": "prometheus", "name": "prometheus",
"public_grafana_server_cidr": "146.48.122.132/32", "public_grafana_server_cidr": "146.48.28.103/32",
"vol_data_device": "/dev/vdb", "vol_data_device": "/dev/vdb",
"vol_data_name": "prometheus-data", "vol_data_name": "prometheus-data",
"vol_data_size": "100" "vol_data_size": "100"
@ -183,11 +188,12 @@
"default": "default", "default": "default",
"docker_swarm": "Docker Swarm", "docker_swarm": "Docker Swarm",
"docker_swarm_NFS": "Docker Swarm NFS", "docker_swarm_NFS": "Docker Swarm NFS",
"haproxy": "HAPROXY L7", "haproxy": "traffic_from_main_lb_to_haproxy_l7",
"http_and_https_from_the_load_balancers": "http and https from the load balancers", "http_and_https_from_the_load_balancers": "traffic_from_the_main_load_balancers",
"limited_HTTPS_access": "Limited HTTPS access", "limited_HTTPS_access": "restricted_web_service",
"limited_SSH_access": "Limited SSH access", "limited_SSH_access": "Limited SSH access",
"mongo": "mongo", "mongo": "mongo",
"nfs_share_no_ingress": "nfs_share_no_ingress",
"orientdb_internal_docker_traffic": "orientdb_internal_docker_traffic", "orientdb_internal_docker_traffic": "orientdb_internal_docker_traffic",
"postgreSQL": "PostgreSQL service", "postgreSQL": "PostgreSQL service",
"public_HTTPS": "Public HTTPS" "public_HTTPS": "Public HTTPS"
@ -219,6 +225,8 @@
"s2i2s_vpn_2_cidr": "146.48.28.11/32", "s2i2s_vpn_2_cidr": "146.48.28.11/32",
"shell_d4s_cidr": "146.48.122.95/32" "shell_d4s_cidr": "146.48.122.95/32"
}, },
"storage_nfs_network_id": "5f4023cc-4016-404c-94e5-86220095fbaf",
"storage_nfs_subnet_id": "6ff0f9e8-0e74-4cc3-a268-7ed4af435696",
"ubuntu1804_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh", "ubuntu1804_data_file": "../../openstack_vm_data_scripts/ubuntu1804.sh",
"ubuntu2204_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh", "ubuntu2204_data_file": "../../openstack_vm_data_scripts/ubuntu2204.sh",
"ubuntu_1804": { "ubuntu_1804": {
@ -319,6 +327,7 @@
"map", "map",
"string" "string"
], ],
"nfs_share_no_ingress_secgroup_id": "string",
"octavia_information": [ "octavia_information": [
"map", "map",
"string" "string"
@ -363,6 +372,8 @@
"map", "map",
"string" "string"
], ],
"storage_nfs_network_id": "string",
"storage_nfs_subnet_id": "string",
"ubuntu1804_data_file": "string", "ubuntu1804_data_file": "string",
"ubuntu2204_data_file": "string", "ubuntu2204_data_file": "string",
"ubuntu_1804": [ "ubuntu_1804": [
@ -410,6 +421,38 @@
} }
] ]
}, },
{
"mode": "managed",
"type": "openstack_dns_recordset_v2",
"name": "keycloak_dev_dns_recordset",
"provider": "provider[\"registry.terraform.io/terraform-provider-openstack/openstack\"]",
"instances": [
{
"schema_version": 0,
"attributes": {
"description": "Keycloak d4science dev endpoint",
"disable_status_check": false,
"id": "cbae638a-9d99-44aa-946c-0f5ffb7fc488/effa71d2-37ff-4237-9a6e-86f4c2e1c53f",
"name": "accounts.cloud-dev.d4science.org.",
"project_id": "e8f8ca72f30648a8b389b4e745ac83a9",
"records": [
"main-lb.cloud-dev.d4science.org."
],
"region": "isti_area_pi_1",
"timeouts": null,
"ttl": 8600,
"type": "CNAME",
"value_specs": null,
"zone_id": "cbae638a-9d99-44aa-946c-0f5ffb7fc488"
},
"sensitive_attributes": [],
"private": "eyJlMmJmYjczMC1lY2FhLTExZTYtOGY4OC0zNDM2M2JjN2M0YzAiOnsiY3JlYXRlIjo2MDAwMDAwMDAwMDAsImRlbGV0ZSI6NjAwMDAwMDAwMDAwLCJ1cGRhdGUiOjYwMDAwMDAwMDAwMH19",
"dependencies": [
"data.terraform_remote_state.privnet_dns_router"
]
}
]
},
{ {
"mode": "managed", "mode": "managed",
"type": "openstack_objectstorage_container_v1", "type": "openstack_objectstorage_container_v1",
@ -512,10 +555,10 @@
"scheduler_hints": [], "scheduler_hints": [],
"security_groups": [ "security_groups": [
"default", "default",
"http and https from the load balancers" "traffic_from_the_main_load_balancers"
], ],
"stop_before_destroy": false, "stop_before_destroy": false,
"tags": null, "tags": [],
"timeouts": null, "timeouts": null,
"updated": "2023-12-14 15:48:18 +0000 UTC", "updated": "2023-12-14 15:48:18 +0000 UTC",
"user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608", "user_data": "bb83b25fd1219aa1b850ece9be8d7b0f31714608",