Ansible roles: - act_runner/defaults: set act_runner_name to inventory_hostname (was hardcoded to iklim-test-app); added vault_gitea_runner_token to vault.yml - prod/group_vars/all: restructured from flat files to all/ directory; added act_runner_labels override (prod-runner,ubuntu-24.04,hostname); added storagebox_managed_directories; added swarm_manager_ip and other prod-specific vars - prod/roles/db_stack: prod-specific db_node tasks using StorageBox paths (/mnt/storagebox/db/...) instead of local paths - docker/tasks: split firewalld loop into all-nodes (Swarm ports) and app-only (80/443) tasks - swarm/tasks: added --advertise-addr private_ip to join commands for correct multi-homed node advertisement - hardening/tasks: corrected firewalld drop zone configuration - node_dirs/tasks: added /opt/iklimco/vault/data for Vault Raft volume - db_stack/tasks/app_node: updated stale comment (removed pg-proxy reference) - db_stack/templates: removed pg-proxy and mongo-proxy service blocks - test/host_vars/iklim-app-01: added act_runner_name override to preserve existing test runner registration Roadmap and setup docs: - roadmap/03-infra-stack-changes: added replicas:0 for etcd/postgresql/ mongodb/pg-proxy/mongo-proxy in prod overlay; updated placement table; fixed grafana/data mkdir (auto-created by Ansible); translated Turkish note to English - roadmap/08-deploy-pipeline-update: updated stale "remains idle" note for standalone etcd (now disabled with replicas:0) - roadmap/01-swarm-init-multinode: consistency fixes - setup/06: added Outputs section and etcd firewall port documentation - setup/07: removed prometheus/data from StorageBox acceptance criteria; replaced manual StorageBox mkdir section with Ansible auto-creation note; updated prod README section with full bootstrap instructions and vault docs; added act_runner_labels prod policy - setup/08: extensive rewrite — aligned with Patroni etcd overlay DNS, corrected hcloud_firewall.app reference, updated all StorageBox paths from /prod/db/ to /db/ - setup/09: removed prometheus/data from acceptance criteria; updated runner label policy (removed docker/swarm-manager labels); added acceptance criterion for disabled services absent from docker service ls Terraform: - prod/firewall.tf: added missing DB subnet mutual rules (etcd, Patroni) - prod/outputs.tf: added prod_floating_ip and prod_private_ips outputs - prod/servers.tf: aligned placement group and naming - prod/variables.tf: corrected variable descriptions - prod/terraform.tfvars.example: updated defaults - terraform/hetzner/README.md: new comprehensive README covering both test and prod environments with firewall tables and inventory instructions ansible/README.md: expanded prod section with inventory groups, bootstrap run order, runner label policy, and vault variable documentation
77 lines
1.8 KiB
HCL
77 lines
1.8 KiB
HCL
resource "hcloud_ssh_key" "admin" {
|
|
name = "${local.name_prefix}-admin-key"
|
|
public_key = file(var.admin_ssh_public_key_path)
|
|
}
|
|
|
|
resource "hcloud_server" "app" {
|
|
for_each = local.app_private_ips
|
|
|
|
name = each.key
|
|
server_type = var.server_type_app
|
|
image = var.image
|
|
location = var.location
|
|
ssh_keys = [hcloud_ssh_key.admin.id]
|
|
placement_group_id = hcloud_placement_group.app_spread.id
|
|
|
|
labels = {
|
|
environment = local.environment
|
|
role = "app"
|
|
type = "service"
|
|
}
|
|
|
|
lifecycle {
|
|
prevent_destroy = true
|
|
}
|
|
}
|
|
|
|
resource "hcloud_server" "db" {
|
|
for_each = local.db_private_ips
|
|
|
|
name = each.key
|
|
server_type = var.server_type_db
|
|
image = var.image
|
|
location = var.location
|
|
ssh_keys = [hcloud_ssh_key.admin.id]
|
|
placement_group_id = hcloud_placement_group.db_spread.id
|
|
|
|
labels = {
|
|
environment = local.environment
|
|
role = "db"
|
|
type = "db"
|
|
}
|
|
|
|
lifecycle {
|
|
prevent_destroy = true
|
|
}
|
|
}
|
|
|
|
resource "hcloud_server_network" "app" {
|
|
for_each = local.app_private_ips
|
|
|
|
server_id = hcloud_server.app[each.key].id
|
|
network_id = hcloud_network.main.id
|
|
ip = each.value
|
|
|
|
depends_on = [hcloud_network_subnet.app]
|
|
}
|
|
|
|
resource "hcloud_server_network" "db" {
|
|
for_each = local.db_private_ips
|
|
|
|
server_id = hcloud_server.db[each.key].id
|
|
network_id = hcloud_network.main.id
|
|
ip = each.value
|
|
|
|
depends_on = [hcloud_network_subnet.db]
|
|
}
|
|
|
|
resource "hcloud_firewall_attachment" "app" {
|
|
firewall_id = hcloud_firewall.app.id
|
|
server_ids = [for s in hcloud_server.app : s.id]
|
|
}
|
|
|
|
resource "hcloud_firewall_attachment" "db" {
|
|
firewall_id = hcloud_firewall.db.id
|
|
server_ids = [for s in hcloud_server.db : s.id]
|
|
}
|