redeploy with g4 flavors/ovs (#434)

* vars.tf: update server flavor to g4 This will schedule future clusters on ovs hosts rather than linuxbridge. Bug: T326373 * vars.tf: update server flavor to g4 This will schedule future clusters on ovs hosts rather than linuxbridge. Bug: T326373 * Update resource names --------- Co-authored-by: Andrew Bogott <[email protected]>
toolforge · Jun 18, 2024 · d75a91b · d75a91b
1 parent 7ce6f70
commit d75a91b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/tofu/126_1.tf → tofu/127.tf b/tofu/126_1.tf → tofu/127.tf
@@ -1,17 +1,17 @@
-resource "openstack_containerinfra_cluster_v1" "k8s_126_1" {
-  name                = "paws${var.name[var.datacenter]}-126-1"
-  cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_126_1.id
+resource "openstack_containerinfra_cluster_v1" "k8s_127" {
+  name                = "paws${var.name[var.datacenter]}-127"
+  cluster_template_id = resource.openstack_containerinfra_clustertemplate_v1.template_127.id
   master_count        = 1
   node_count          = var.workers[var.datacenter]
 }
 
 resource "local_file" "kube_config" {
-  content  = resource.openstack_containerinfra_cluster_v1.k8s_126_1.kubeconfig.raw_config
+  content  = resource.openstack_containerinfra_cluster_v1.k8s_127.kubeconfig.raw_config
   filename = "kube.config"
 }
 
-resource "openstack_containerinfra_clustertemplate_v1" "template_126_1" {
-  name                  = "paws${var.name[var.datacenter]}-126-1"
+resource "openstack_containerinfra_clustertemplate_v1" "template_127" {
+  name                  = "paws${var.name[var.datacenter]}-127"
   coe                   = "kubernetes"
   dns_nameserver        = "8.8.8.8"
   docker_storage_driver = "overlay2"

diff --git a/tofu/vars.tf b/tofu/vars.tf
@@ -38,15 +38,15 @@ variable "application_credential_id" {
 variable "worker_flavor" {
   type = map(any)
   default = {
-    "codfw1dev" = "g3.cores1.ram2.disk20"
-    "eqiad1"    = "g3.cores8.ram32.disk20"
+    "codfw1dev" = "g4.cores1.ram2.disk20"
+    "eqiad1"    = "g4.cores8.ram32.disk20"
   }
 }
 variable "control_flavor" {
   type = map(any)
   default = {
-    "codfw1dev" = "g3.cores1.ram2.disk20"
-    "eqiad1"    = "g3.cores2.ram4.disk20"
+    "codfw1dev" = "g4.cores1.ram2.disk20"
+    "eqiad1"    = "g4.cores2.ram4.disk20"
   }
 }
 variable "volume_size" {