sleep in workflows

MozeBaltyk · Jun 17, 2024 · 38b66cd · 38b66cd
1 parent d2a6048
commit 38b66cd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/test/DO/infra/local.tf b/test/DO/infra/local.tf
@@ -8,8 +8,7 @@
 locals {
   cloud_init_config = yamlencode({
     packages = [
-      "ansible",
-      "make"
+      "python3.12"
     ]
   })
 }
@@ -39,6 +38,7 @@ locals {
       }
     },
     packages = [
+      "python3.12",
       "epel-release",
       "s3fs-fuse",
       "git",

diff --git a/test/DO/infra/main.tf b/test/DO/infra/main.tf
@@ -57,38 +57,41 @@ resource "null_resource" "placeholder" {
 ###
 
 # Droplet Instance for RKE2 Cluster - Manager
+# name = "controller${count.index}.${var.domain}"
 resource "digitalocean_droplet" "controllers" {
     count = var.controller_count
     image = var.do_system
-    name = "controller${count.index}.${var.domain}"
+    name = "${format("%s-%2s%02d", controller, count.index + 1, var.domain)}"
     region = var.region
     size = var.instance_size
     tags   = [
       "rkub-${var.GITHUB_RUN_ID}",
       "controller",
-      "${var.do_system}_controllers",
+      "${var.do_system}",
       ]
     vpc_uuid = digitalocean_vpc.rkub-project-network.id
     ssh_keys = [ digitalocean_ssh_key.ssh_key.fingerprint ]
     # if airgap, S3 bucket is mounted on master to get the resources
-    user_data = var.airgap ? data.cloudinit_config.server_airgap_config.rendered : null
+    user_data = var.airgap ? data.cloudinit_config.server_airgap_config.rendered : data.cloudinit_config.server_config.rendered
     depends_on = [ null_resource.placeholder, digitalocean_ssh_key.ssh_key ] # Ensure VPC and SSH key are created first
 }
 
 # Droplet Instance for RKE2 Cluster - Workers
+# name = "worker${count.index}.${var.domain}"
 resource "digitalocean_droplet" "workers" {
     count = var.worker_count
     image = var.do_system
-    name = "worker${count.index}.${var.domain}"
+    name = "${format("%s-%2s%02d", worker, count.index + 1, var.domain)}"
     region = var.region
     size = var.instance_size
     tags   = [
       "rkub-${var.GITHUB_RUN_ID}",
       "worker",
-      "${var.do_system}_workers",
+      "${var.do_system}",
       ]
     vpc_uuid = digitalocean_vpc.rkub-project-network.id
     ssh_keys = [ digitalocean_ssh_key.ssh_key.fingerprint ]
+    user_data = data.cloudinit_config.server_config.rendered
     depends_on = [ null_resource.placeholder, digitalocean_ssh_key.ssh_key ] # Ensure VPC and SSH key are created first
 }