dupe

nycmeshnet · Jul 23, 2024 · aeee084 · aeee084
1 parent 3d02176
commit aeee084
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/.github/workflows/deploy_dev3.yaml b/.github/workflows/deploy_dev3.yaml
@@ -73,7 +73,7 @@ jobs:
       - name: Terraform plan
         id: plan
         if: github.event_name == 'pull_request'
-        run: terraform plan -no-color -input=false
+        run: terraform plan -no-color -input=false -var-file=${{ vars.ENV_NAME }}.tfvars
         continue-on-error: true
         working-directory: ./terraform/
 
@@ -88,7 +88,7 @@ jobs:
           echo "${{ secrets.SSH_PUBLIC_KEY }}" > meshdb_cluster/meshdb{{ vars.ENV_NAME }}.pub
           chmod 600 meshdb_cluster/meshdb${{ vars.ENV_NAME }}
           chmod 600 meshdb_cluster/meshdb${{ vars.ENV_NAME }}.pub
-          terraform apply -auto-approve -input=false
+          terraform apply -auto-approve -input=false -var-file=${{ vars.ENV_NAME }}.tfvars
         working-directory: ./terraform/
 
       - name: Run playbook

diff --git a/terraform/prod.tfvars → terraform/prod1.tfvars b/terraform/prod.tfvars → terraform/prod1.tfvars
diff --git a/terraform/vars.tf b/terraform/vars.tf
@@ -14,12 +14,6 @@ variable "meshdb_proxmox_token_secret" {
   sensitive   = true
 }
 
-variable "meshdb_local_password" {
-  type        = string
-  description = "password for the local user"
-  sensitive   = true
-}
-
 variable "k3s_token" {
   type        = string
   description = "token for the k3s cluster"
@@ -102,9 +96,3 @@ variable "vm_nic" {
   description = "nic for the vms"
   default     = "vmbr0"
 }
-
-variable "k3s_token" {
-  type        = string
-  description = "token for the k3s cluster"
-  sensitive   = true
-}