From 94ea71ac6eb17b9693742625bd016c85c5f328da Mon Sep 17 00:00:00 2001 From: sean-freeman <1815807+sean-freeman@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:49:26 +0000 Subject: [PATCH] sap_vm_provision: append tf vars to ibm powervs --- .../ibmcloud_powervs/tf_template/tf_template.tf | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/roles/sap_vm_provision/tasks/platform_ansible_to_terraform/ibmcloud_powervs/tf_template/tf_template.tf b/roles/sap_vm_provision/tasks/platform_ansible_to_terraform/ibmcloud_powervs/tf_template/tf_template.tf index 6037c22..eefe6da 100644 --- a/roles/sap_vm_provision/tasks/platform_ansible_to_terraform/ibmcloud_powervs/tf_template/tf_template.tf +++ b/roles/sap_vm_provision/tasks/platform_ansible_to_terraform/ibmcloud_powervs/tf_template/tf_template.tf @@ -291,14 +291,13 @@ module "run_host_provision_module" { module_var_dns_custom_resolver_ip = module.run_powervs_interconnect_proxy_provision_module.output_dns_custom_resolver_ip - module_var_web_proxy_enable = true - module_var_os_vendor_enable = false # After Terraform has provisioned hosts, this will be done by Ansible - + module_var_web_proxy_enable = true module_var_web_proxy_url = "http://${module.run_powervs_interconnect_proxy_provision_module.output_proxy_private_ip}:${module.run_powervs_interconnect_proxy_provision_module.output_proxy_port_squid}" - module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain) + module_var_web_proxy_exclusion = "localhost,127.0.0.1,${var.sap_vm_provision_dns_root_domain}" // Web Proxy exclusion list for hosts running on IBM Power (e.g. localhost,127.0.0.1,custom.root.domain) - module_var_os_vendor_account_user = var.os_vendor_account_user - module_var_os_vendor_account_user_passcode = var.os_vendor_account_user_passcode + module_var_os_vendor_enable = false # After Terraform has provisioned hosts, this will be done by Ansible + module_var_os_vendor_account_user = "" + module_var_os_vendor_account_user_passcode = "" # Set Terraform Module Variables using for_each loop on a map Terraform Variable with nested objects