update to allow s3 in codfw1dev

deploy.sh

@@ -48,8 +48,8 @@ pip install ansible==8.1.0 kubernetes==26.1.0
 
 
 cd tofu
-AWS_ACCESS_KEY_ID=${ACCESS_KEY} AWS_SECRET_ACCESS_KEY=${SECRET_KEY} tofu init
-AWS_ACCESS_KEY_ID=${ACCESS_KEY} AWS_SECRET_ACCESS_KEY=${SECRET_KEY} tofu apply -var datacenter=${datacenter} # -auto-approve
+AWS_ACCESS_KEY_ID=${ACCESS_KEY} AWS_SECRET_ACCESS_KEY=${SECRET_KEY} tofu init -backend-config=${datacenter}-backend.conf
+AWS_ACCESS_KEY_ID=${ACCESS_KEY} AWS_SECRET_ACCESS_KEY=${SECRET_KEY} tofu apply -var datacenter=${datacenter}
 export KUBECONFIG=$(pwd)/kube.config
 
 if [ "${tofuonly}" = '1' ]

paws/codfw.yaml

@@ -9,27 +9,27 @@ jupyterhub:
     extraVolumes:
       - name: homes
         nfs:
-          server: haproxy-and-nfs.paws-dev.codfw1dev.wikimedia.cloud
+          server: pawsdev-nfs.pawsdev.codfw1dev.wikimedia.cloud
           path: /srv/paws/project
       - name: dumps
         nfs:
-          server: haproxy-and-nfs.paws-dev.codfw1dev.wikimedia.cloud
+          server: pawsdev-nfs.pawsdev.codfw1dev.wikimedia.cloud
           path: /
       # Without this, dumps becomes inaccessible and can hang the host
       - name: dumps-src1
         nfs:
-          server: haproxy-and-nfs.paws-dev.codfw1dev.wikimedia.cloud
+          server: pawsdev-nfs.pawsdev.codfw1dev.wikimedia.cloud
           path: /
       - name: dumps-src2
         nfs:
-          server: haproxy-and-nfs.paws-dev.codfw1dev.wikimedia.cloud
+          server: pawsdev-nfs.pawsdev.codfw1dev.wikimedia.cloud
           path: /
     extraConfig:
       00-myConfig: |
           localdev = False
-          nfs_home = 'haproxy-and-nfs.paws-dev.codfw1dev.wikimedia.cloud'
-          dumps_src1 = 'haproxy-and-nfs.paws-dev.codfw1dev.wikimedia.cloud'
-          dumps_src2 = 'haproxy-and-nfs.paws-dev.codfw1dev.wikimedia.cloud'
+          nfs_home = 'pawsdev-nfs.pawsdev.codfw1dev.wikimedia.cloud'
+          dumps_src1 = 'pawsdev-nfs.pawsdev.codfw1dev.wikimedia.cloud'
+          dumps_src2 = 'pawsdev-nfs.pawsdev.codfw1dev.wikimedia.cloud'
   ingress:
     enabled: true
     hosts:

tofu/codfw1dev-backend.conf

@@ -0,0 +1,11 @@
+# https://github.com/hashicorp/terraform/issues/13022
+
+region   = "codfw1dev"
+bucket   = "pawsdev:tofu-state"
+endpoint = "https://object.codfw1dev.wikimediacloud.org"
+key      = "state/main"
+
+
+skip_region_validation      = true
+skip_credentials_validation = true
+force_path_style            = true

tofu/eqiad1-backend.conf

@@ -0,0 +1,10 @@
+# https://github.com/hashicorp/terraform/issues/13022
+
+region   = "eqiad1"
+bucket   = "paws:tofu-state"
+endpoint = "https://object.eqiad1.wikimediacloud.org"
+key      = "state/main"
+
+skip_region_validation      = true
+skip_credentials_validation = true
+force_path_style            = true

tofu/main.tf

@@ -1,15 +1,6 @@
 terraform {
   required_version = ">= 1.6.0"
-  backend "s3" {
-    region   = "eqiad1"
-    bucket   = "paws:tofu-state"
-    endpoint = "https://object.eqiad1.wikimediacloud.org"
-    key      = "state/main"
-
-    skip_region_validation      = true
-    skip_credentials_validation = true
-    force_path_style            = true
-  }
+  backend "s3" {}
   required_providers {
     openstack = {
       source  = "terraform-provider-openstack/openstack"

tofu/vars.tf

@@ -22,14 +22,14 @@ variable "auth-url" {
 variable "tenant_id" {
   type = map(any)
   default = {
-    "codfw1dev" = "paws-dev"
+    "codfw1dev" = "pawsdev"
     "eqiad1"    = "paws"
   }
 }
 variable "application_credential_id" {
   type = map(any)
   default = {
-    "codfw1dev" = "e487b78d4c5d4bb6a30c2f7471b03bc0"
+    "codfw1dev" = "3f7f32ab28484173b127e1fb435057ff"
     "eqiad1"    = "74fa33352a4a44038e7f924324194fe5"
   }
 }