PRODENG-2553 use upstream provision for smoke test

- switch smoke testing to use the published provision module - cleanup key planning Signed-off-by: James Nesbitt <[email protected]>
Mirantis · Mar 5, 2024 · fe3b2d9 · fe3b2d9
1 parent 344be50
commit fe3b2d9
Show file tree

Hide file tree

Showing 32 changed files with 12 additions and 1,274 deletions.
diff --git a/examples/tf-aws/launchpad/.gitignore b/examples/tf-aws/launchpad/.gitignore
@@ -3,14 +3,12 @@
 
 # our module puts a private ssh key into this folder.
 *.key
+*.pem
 
 # Terraform stuff
 terraform.tfstate*
-
-# SSH-KEYS
-./ssh-keys/
-
-.terraform/
+*.tfvars
+.terraform
 
 launchpad.yaml
 
diff --git a/examples/tf-aws/launchpad/key.tf b/examples/tf-aws/launchpad/key.tf
@@ -3,19 +3,15 @@
 #
 
 module "key" {
-  source = "../provision/modules/key/ed25519"
+  source = "terraform-mirantis-modules/provision-aws/mirantis//modules/key/ed25519"
 
-  name = "${var.name}-common.pem"
+  name = "${var.name}-common"
   tags = local.tags
 }
 
-locals {
-  pk_path = var.ssh_pk_location != "" ? join("/", [var.ssh_pk_location, module.key.name]) : "./ssh-keys/${module.key.name}"
-}
-
 resource "local_sensitive_file" "ssh_private_key" {
   content              = module.key.private_key
-  filename             = local.pk_path
-  file_permission      = "0777"
-  directory_permission = "0777"
+  filename             = join("/", [var.ssh_pk_location, "${var.name}-common.pem"])
+  file_permission      = "0600"
+  directory_permission = "0700"
 }
diff --git a/examples/tf-aws/launchpad/platform.tf b/examples/tf-aws/launchpad/platform.tf
@@ -9,7 +9,7 @@ locals {
 
 module "platform" {
   count  = length(local.unique_used_platforms)
-  source = "../provision/modules/platform"
+  source = "terraform-mirantis-modules/provision-aws/mirantis//modules/platform"
 
   platform_key     = local.unique_used_platforms[count.index]
   windows_password = var.windows_password

diff --git a/examples/tf-aws/launchpad/provision.tf b/examples/tf-aws/launchpad/provision.tf
@@ -6,7 +6,7 @@ locals {
 
 # PROVISION MACHINES/NETWORK
 module "provision" {
-  source = "../provision"
+  source = "terraform-mirantis-modules/provision-aws/mirantis"
 
   name = var.name
   tags = local.tags

diff --git a/examples/tf-aws/launchpad/variables.tf b/examples/tf-aws/launchpad/variables.tf
@@ -56,5 +56,5 @@ variable "windows_password" {
 variable "ssh_pk_location" {
   description = "Location of the ssh private key"
   type        = string
-  default     = ""
+  default     = "."
 }
diff --git a/examples/tf-aws/provision/ingress.tf b/examples/tf-aws/provision/ingress.tf
diff --git a/examples/tf-aws/provision/modules/ingress/lb.tf b/examples/tf-aws/provision/modules/ingress/lb.tf
diff --git a/examples/tf-aws/provision/modules/ingress/output.tf b/examples/tf-aws/provision/modules/ingress/output.tf
diff --git a/examples/tf-aws/provision/modules/ingress/variables.tf b/examples/tf-aws/provision/modules/ingress/variables.tf
diff --git a/examples/tf-aws/provision/modules/key/ed25519/README.md b/examples/tf-aws/provision/modules/key/ed25519/README.md
diff --git a/examples/tf-aws/provision/modules/key/ed25519/key.tf b/examples/tf-aws/provision/modules/key/ed25519/key.tf
diff --git a/examples/tf-aws/provision/modules/key/ed25519/output.tf b/examples/tf-aws/provision/modules/key/ed25519/output.tf
diff --git a/examples/tf-aws/provision/modules/key/ed25519/variables.tf b/examples/tf-aws/provision/modules/key/ed25519/variables.tf
diff --git a/examples/tf-aws/provision/modules/key/ed25519/versions.tf b/examples/tf-aws/provision/modules/key/ed25519/versions.tf
diff --git a/examples/tf-aws/provision/modules/nodegroup/asg.tf b/examples/tf-aws/provision/modules/nodegroup/asg.tf
diff --git a/examples/tf-aws/provision/modules/nodegroup/nodes.tf b/examples/tf-aws/provision/modules/nodegroup/nodes.tf
diff --git a/examples/tf-aws/provision/modules/nodegroup/output.tf b/examples/tf-aws/provision/modules/nodegroup/output.tf