From d354bfa02472f109374b807ff174535d0337f8d7 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Fri, 4 Nov 2022 22:35:20 +0000 Subject: [PATCH] Update terraform/variables.tf, .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- terraform/variables.tf | 24 ------------------------ 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2238360..db516f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ plan: stage: plan variables: WORKDIR: $CI_PROJECT_DIR/terraform - ARGUMENTS: -var=pm_password=$pm_password -var=pm_api_url=$pm_api_url + ARGUMENTS: -var=pm_password=$pm_password -var=pm_api_url=$pm_api_url -var-file=terraform.tfvars allow_failure: false extends: .terraform_plan only: diff --git a/terraform/variables.tf b/terraform/variables.tf index de8db20..a2be6be 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -39,18 +39,6 @@ variable "k3master" { tag = number ip = list(number) }) - default = { - count = "1" - name = ["master01"] - cores = "2" - memory = "2048" - drive = "20G" - storage = "domains" - template = "CentOS9-Template" - node = "overlord" - tag = "20" - ip = ["121"] - } } variable "k3server" { @@ -67,16 +55,4 @@ variable "k3server" { tag = number ip = list(number) }) - default = { - count = "1" - name = ["node01"] - cores = "2" - memory = "4096" - drive = "60G" - storage = "domains" - template = "CentOS9-Template" - node = "overlord" - tag = "20" - ip = ["124"] - } }