diff --git a/.octopus/deployment_process.ocl b/.octopus/deployment_process.ocl index b803d1c..4807085 100644 --- a/.octopus/deployment_process.ocl +++ b/.octopus/deployment_process.ocl @@ -7,7 +7,7 @@ step "terraform-plan" { Octopus.Action.GoogleCloud.ImpersonateServiceAccount = "False" Octopus.Action.GoogleCloud.UseVMServiceAccount = "True" Octopus.Action.RunOnServer = "true" - Octopus.Action.Script.ScriptSource = "Inline" + Octopus.Action.Script.ScriptSource = "Package" Octopus.Action.Terraform.AdditionalInitParams = "#{TF_INIT}" Octopus.Action.Terraform.AllowPluginDownloads = "True" Octopus.Action.Terraform.AzureAccount = "False" @@ -15,39 +15,13 @@ step "terraform-plan" { Octopus.Action.Terraform.ManagedAccount = "None" Octopus.Action.Terraform.PlanJsonOutput = "False" Octopus.Action.Terraform.RunAutomaticFileSubstitution = "True" - Octopus.Action.Terraform.Template = <<-EOT - module "RKE" { - source = "git::https://gitlab.com/developerdurp/tf-modules.git//TERRAFORM.PROXMOX.RKE" - - dnsserver = "#{dnsserver}" - sshkeys = "#{sshkeys}" - vlan = "#{vlan}" - bridge = "#{bridge}" - appname = "#{appname}" - searchdomain = "#{searchdomain}" - - master = { - count = "#{mastercount}" - template = "#{master-template}" - cores = "#{mastercores}" - memory = "#{mastermemory}" - node = "#{masternode}" - ip = "#{masterip}" - } - - pm_api_url = "#{pm_api_url}" - pm_api_token_id = "#{pm_api_token_id}" - pm_api_token_secret = "#{pm_api_token_secret}" - } - EOT - Octopus.Action.Terraform.TemplateParameters = "{}" OctopusUseBundledTooling = "False" } worker_pool_variable = "" container { feed = "nexus" - image = "octopusdeploy/worker-tools:6.1.0-ubuntu.22.04" + image = "#{TF_CONTAINER}" } } }