From f28c7f38b96dfd3630d797894e419d7e0df11b03 Mon Sep 17 00:00:00 2001 From: sean-freeman <1815807+sean-freeman@users.noreply.github.com> Date: Fri, 22 Nov 2024 18:37:08 +0000 Subject: [PATCH] sap_vm_provision: update ibm powervs locations --- .../ibmcloud_powervs/execute_main.yml | 22 +++++++++++----- .../tf_template/tf_template_input_vars.tf | 26 ++++++++++++------- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/roles/sap_vm_provision/tasks/platform_ansible/ibmcloud_powervs/execute_main.yml b/roles/sap_vm_provision/tasks/platform_ansible/ibmcloud_powervs/execute_main.yml index 44fb341..79f033e 100644 --- a/roles/sap_vm_provision/tasks/platform_ansible/ibmcloud_powervs/execute_main.yml +++ b/roles/sap_vm_provision/tasks/platform_ansible/ibmcloud_powervs/execute_main.yml @@ -3,16 +3,21 @@ - name: Set fact for IBM Power VS location to the colocated IBM Cloud Availability Zone (VPC) ansible.builtin.set_fact: list_ibmcloud_powervs_location_to_ibmcloud_availability_zone: + dal10: "us-south-1" dal12: "us-south-2" - us-south: "us-south-3" # naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13' - us-east: "us-east-1" # naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04' - # wdc06: "us-east-2" # No Cloud Connection available at this location + us-south: "us-south-3" # naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13' + us-east: "us-east-1" # naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04' + wdc06: "us-east-2" + wdc07: "us-east-3" sao01: "br-sao-1" + sao02: "br-sao-2" tor01: "ca-tor-1" - eu-de-1: "eu-de-2" # naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04' - eu-de-2: "eu-de-3" # naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05' + eu-de-1: "eu-de-2" # naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04' + eu-de-2: "eu-de-3" # naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05' lon04: "eu-gb-1" lon06: "eu-gb-3" + mad02: "eu-es-1" + mad04: "eu-es-2" syd04: "au-syd-2" syd05: "au-syd-3" tok04: "jp-tok-2" @@ -23,16 +28,21 @@ - name: Set fact for IBM Power VS location to the IBM Power VS Region API Endpoints ansible.builtin.set_fact: list_ibmcloud_powervs_location_to_powervs_region: + dal10: "us-south" dal12: "us-south" us-south: "us-south" us-east: "us-east" - # wdc06: "us-east" # no Cloud Connection available at this location + wdc06: "us-east" + wdc07: "us-east" sao01: "sao" + sao02: "sao" tor01: "tor" eu-de-1: "eu-de" eu-de-2: "eu-de" lon04: "lon" lon06: "lon" + mad02: "mad" + mad04: "mad" syd04: "syd" syd05: "syd" tok04: "tok" diff --git a/roles/sap_vm_provision/tasks/platform_ansible_to_terraform/ibmcloud_powervs/tf_template/tf_template_input_vars.tf b/roles/sap_vm_provision/tasks/platform_ansible_to_terraform/ibmcloud_powervs/tf_template/tf_template_input_vars.tf index e668953..6c0b73b 100644 --- a/roles/sap_vm_provision/tasks/platform_ansible_to_terraform/ibmcloud_powervs/tf_template/tf_template_input_vars.tf +++ b/roles/sap_vm_provision/tasks/platform_ansible_to_terraform/ibmcloud_powervs/tf_template/tf_template_input_vars.tf @@ -30,22 +30,25 @@ variable "map_ibm_powervs_to_vpc_az" { type = map(any) default = { - + dal10 = "us-south-1" dal12 = "us-south-2" - us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'DAL13' - us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'WDC04' - # wdc06 = "us-east-2" // No Cloud Connection available at this location + us-south = "us-south-3" // naming of IBM Power VS location 'us-south' was previous naming convention, would otherwise be 'dal13' + us-east = "us-east-1" // naming of IBM Power VS location 'us-east' was previous naming convention, would otherwise be 'wdc04' + wdc06 = "us-east-2" + wdc07 = "us-east-3" sao01 = "br-sao-1" + sao02 = "br-sao-2" tor01 = "ca-tor-1" - eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'FRA04' - eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'FRA05' + eu-de-1 = "eu-de-2" // naming of IBM Power VS location 'eu-de-1' was previous naming convention, would otherwise be 'fra04' + eu-de-2 = "eu-de-3" // naming of IBM Power VS location 'eu-de-2' was previous naming convention, would otherwise be 'fra05' lon04 = "eu-gb-1" lon06 = "eu-gb-3" + mad02 = "eu-es-1" + mad04 = "eu-es-2" syd04 = "au-syd-2" syd05 = "au-syd-3" tok04 = "jp-tok-2" osa21 = "jp-osa-1" - } } @@ -60,22 +63,25 @@ variable "map_ibm_powervs_location_to_powervs_region" { type = map(any) default = { - + dal10 = "us-south" dal12 = "us-south" us-south = "us-south" us-east = "us-east" - # wdc06 = "us-east" // no Cloud Connection available at this location + wdc06 = "us-east" + wdc07 = "us-east" sao01 = "sao" + sao02 = "sao" tor01 = "tor" eu-de-1 = "eu-de" eu-de-2 = "eu-de" lon04 = "lon" lon06 = "lon" + mad02 = "mad" + mad04 = "mad" syd04 = "syd" syd05 = "syd" tok04 = "tok" osa21 = "osa" - } }