From 3cb8725d54a5282ce00bce8bf4e13968f20681cb Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Mon, 6 Nov 2023 13:06:47 +0100 Subject: [PATCH] Manage the SSH keys in a separate task. --- openstack-tf/common_setups/ssh-keys.tf | 8 +++---- .../basic-infrastructure/16-ssh-keys.tf | 1 - .../00-terraform-provider.tf | 1 + .../05-projects-and-users-vars.tf | 1 + .../ssh-keys-management/ssh-keys.tf | 1 + .../basic-infrastructure/16-ssh-keys.tf | 1 - ...roduction-basic-infrastructure.auto.tfvars | 21 +++++++++++++++++++ .../00-terraform-provider.tf | 1 + .../05-projects-and-users-vars.tf | 1 + .../ssh-keys-management/ssh-keys.tf | 1 + 10 files changed, 31 insertions(+), 6 deletions(-) delete mode 120000 openstack-tf/d4s-preprod/basic-infrastructure/16-ssh-keys.tf create mode 120000 openstack-tf/d4s-preprod/ssh-keys-management/00-terraform-provider.tf create mode 120000 openstack-tf/d4s-preprod/ssh-keys-management/05-projects-and-users-vars.tf create mode 120000 openstack-tf/d4s-preprod/ssh-keys-management/ssh-keys.tf delete mode 120000 openstack-tf/d4s-production/basic-infrastructure/16-ssh-keys.tf create mode 100644 openstack-tf/d4s-production/basic-infrastructure/production-basic-infrastructure.auto.tfvars create mode 120000 openstack-tf/d4s-production/ssh-keys-management/00-terraform-provider.tf create mode 120000 openstack-tf/d4s-production/ssh-keys-management/05-projects-and-users-vars.tf create mode 120000 openstack-tf/d4s-production/ssh-keys-management/ssh-keys.tf diff --git a/openstack-tf/common_setups/ssh-keys.tf b/openstack-tf/common_setups/ssh-keys.tf index a05f5b0..662d992 100644 --- a/openstack-tf/common_setups/ssh-keys.tf +++ b/openstack-tf/common_setups/ssh-keys.tf @@ -1,4 +1,4 @@ -# resource "openstack_compute_keypair_v2" "initial_ssh_key" { -# name = var.ssh_key_file.name -# public_key = "${file("${var.ssh_key_file.file}.pub")}" -# } +resource "openstack_compute_keypair_v2" "initial_ssh_key" { + name = var.ssh_key_file.name + public_key = "${file("${var.ssh_key_file.file}.pub")}" +} diff --git a/openstack-tf/d4s-preprod/basic-infrastructure/16-ssh-keys.tf b/openstack-tf/d4s-preprod/basic-infrastructure/16-ssh-keys.tf deleted file mode 120000 index 95414a1..0000000 --- a/openstack-tf/d4s-preprod/basic-infrastructure/16-ssh-keys.tf +++ /dev/null @@ -1 +0,0 @@ -../../common_setups/16-ssh-keys.tf \ No newline at end of file diff --git a/openstack-tf/d4s-preprod/ssh-keys-management/00-terraform-provider.tf b/openstack-tf/d4s-preprod/ssh-keys-management/00-terraform-provider.tf new file mode 120000 index 0000000..c094d20 --- /dev/null +++ b/openstack-tf/d4s-preprod/ssh-keys-management/00-terraform-provider.tf @@ -0,0 +1 @@ +../../common_variables/00-terraform-provider.tf \ No newline at end of file diff --git a/openstack-tf/d4s-preprod/ssh-keys-management/05-projects-and-users-vars.tf b/openstack-tf/d4s-preprod/ssh-keys-management/05-projects-and-users-vars.tf new file mode 120000 index 0000000..22fce1f --- /dev/null +++ b/openstack-tf/d4s-preprod/ssh-keys-management/05-projects-and-users-vars.tf @@ -0,0 +1 @@ +../../common_variables/05-projects-and-users-vars.tf \ No newline at end of file diff --git a/openstack-tf/d4s-preprod/ssh-keys-management/ssh-keys.tf b/openstack-tf/d4s-preprod/ssh-keys-management/ssh-keys.tf new file mode 120000 index 0000000..b6adaff --- /dev/null +++ b/openstack-tf/d4s-preprod/ssh-keys-management/ssh-keys.tf @@ -0,0 +1 @@ +../../common_setups/ssh-keys.tf \ No newline at end of file diff --git a/openstack-tf/d4s-production/basic-infrastructure/16-ssh-keys.tf b/openstack-tf/d4s-production/basic-infrastructure/16-ssh-keys.tf deleted file mode 120000 index 95414a1..0000000 --- a/openstack-tf/d4s-production/basic-infrastructure/16-ssh-keys.tf +++ /dev/null @@ -1 +0,0 @@ -../../common_setups/16-ssh-keys.tf \ No newline at end of file diff --git a/openstack-tf/d4s-production/basic-infrastructure/production-basic-infrastructure.auto.tfvars b/openstack-tf/d4s-production/basic-infrastructure/production-basic-infrastructure.auto.tfvars new file mode 100644 index 0000000..871ec85 --- /dev/null +++ b/openstack-tf/d4s-production/basic-infrastructure/production-basic-infrastructure.auto.tfvars @@ -0,0 +1,21 @@ +shared_postgresql_server_data = { + name ="shared-postgresql-server" + flavor = "m1.large" + vol_data_name = "shared-postgresql-data" + vol_data_size = "300" + vol_data_device = "/dev/vdb" + vol_backup_name = "shared-postgresql-backup-data" + vol_backup_size = "100" + vol_backup_device = "/dev/vdc" + network_name = "postgresql-srv-net" + network_description = "Network used to communicate with the shared postgresql service" + network_cidr = "192.168.0.0/22" + allocation_pool_start = "192.168.0.100" + allocation_pool_end = "192.168.3.254" + server_ip = "192.168.0.5" + server_cidr = "192.168.0.5/22" +} + +# Provided in the output of the project setup +main_private_network_id = "020df98d-ae72-452a-b376-3b6dc289acac" +dns_zone_id = "74135b34-1a9c-4c01-8cf0-22450a5660c4" diff --git a/openstack-tf/d4s-production/ssh-keys-management/00-terraform-provider.tf b/openstack-tf/d4s-production/ssh-keys-management/00-terraform-provider.tf new file mode 120000 index 0000000..c094d20 --- /dev/null +++ b/openstack-tf/d4s-production/ssh-keys-management/00-terraform-provider.tf @@ -0,0 +1 @@ +../../common_variables/00-terraform-provider.tf \ No newline at end of file diff --git a/openstack-tf/d4s-production/ssh-keys-management/05-projects-and-users-vars.tf b/openstack-tf/d4s-production/ssh-keys-management/05-projects-and-users-vars.tf new file mode 120000 index 0000000..22fce1f --- /dev/null +++ b/openstack-tf/d4s-production/ssh-keys-management/05-projects-and-users-vars.tf @@ -0,0 +1 @@ +../../common_variables/05-projects-and-users-vars.tf \ No newline at end of file diff --git a/openstack-tf/d4s-production/ssh-keys-management/ssh-keys.tf b/openstack-tf/d4s-production/ssh-keys-management/ssh-keys.tf new file mode 120000 index 0000000..b6adaff --- /dev/null +++ b/openstack-tf/d4s-production/ssh-keys-management/ssh-keys.tf @@ -0,0 +1 @@ +../../common_setups/ssh-keys.tf \ No newline at end of file