From 041cfd9e9d018e089af2d594ce080cfdfd30bda2 Mon Sep 17 00:00:00 2001 From: Michele Pagot Date: Tue, 21 Nov 2023 17:00:56 +0100 Subject: [PATCH] Remove qesap setting HANA_OS_MAJOR_VERSION Remove Terraform variable that does no more exist in qe-sap-deployment. --- data/sles4sap/qe_sap_deployment/sles4sap_aws_generic.yaml | 1 - data/sles4sap/qe_sap_deployment/sles4sap_azure_generic.yaml | 1 - .../qe_sap_deployment/sles4sap_azure_generic_maintenance.yaml | 1 - data/sles4sap/qe_sap_deployment/sles4sap_azure_generic_uri.yaml | 1 - tests/sles4sap/publiccloud/qesap_terraform.pm | 1 - 5 files changed, 5 deletions(-) diff --git a/data/sles4sap/qe_sap_deployment/sles4sap_aws_generic.yaml b/data/sles4sap/qe_sap_deployment/sles4sap_aws_generic.yaml index f34a8a0853fc..a1c15e20fb7d 100644 --- a/data/sles4sap/qe_sap_deployment/sles4sap_aws_generic.yaml +++ b/data/sles4sap/qe_sap_deployment/sles4sap_aws_generic.yaml @@ -19,7 +19,6 @@ terraform: aws_credentials: '/root/amazon_credentials' os_image: '%SLES4SAP_OS_IMAGE_NAME%' os_owner: '%SLE_IMAGE_OWNER%' - hana_os_major_version: '%HANA_OS_MAJOR_VERSION%' # HANA hana_count: '%NODE_COUNT%' diff --git a/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic.yaml b/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic.yaml index 80a8bf52b7eb..890e2845a814 100644 --- a/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic.yaml +++ b/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic.yaml @@ -17,7 +17,6 @@ terraform: public_key: '~/.ssh/id_rsa.pub' private_key: '~/.ssh/id_rsa' os_image: '%SLES4SAP_OS_IMAGE_NAME%' - hana_os_major_version: '%HANA_OS_MAJOR_VERSION%' hana_remote_python: '%ANSIBLE_REMOTE_PYTHON%' iscsi_remote_python: '%ANSIBLE_REMOTE_PYTHON%' diff --git a/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic_maintenance.yaml b/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic_maintenance.yaml index f5c46754a13c..3cd82f801876 100644 --- a/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic_maintenance.yaml +++ b/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic_maintenance.yaml @@ -19,7 +19,6 @@ terraform: public_key: '~/.ssh/id_rsa.pub' private_key: '~/.ssh/id_rsa' os_image: '%SLES4SAP_OS_IMAGE_NAME%' - hana_os_major_version: '%HANA_OS_MAJOR_VERSION%' hana_remote_python: '%ANSIBLE_REMOTE_PYTHON%' iscsi_remote_python: '%ANSIBLE_REMOTE_PYTHON%' diff --git a/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic_uri.yaml b/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic_uri.yaml index d14329319c41..2a49b0df329c 100644 --- a/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic_uri.yaml +++ b/data/sles4sap/qe_sap_deployment/sles4sap_azure_generic_uri.yaml @@ -18,7 +18,6 @@ terraform: public_key: '~/.ssh/id_rsa.pub' private_key: '~/.ssh/id_rsa' os_image_uri: '%SLES4SAP_OS_IMAGE_NAME%' - hana_os_major_version: '%HANA_OS_MAJOR_VERSION%' # HANA hana_count: '%NODE_COUNT%' diff --git a/tests/sles4sap/publiccloud/qesap_terraform.pm b/tests/sles4sap/publiccloud/qesap_terraform.pm index eceff12563da..92f35802b1c0 100644 --- a/tests/sles4sap/publiccloud/qesap_terraform.pm +++ b/tests/sles4sap/publiccloud/qesap_terraform.pm @@ -11,7 +11,6 @@ # NODE_COUNT - number of nodes to deploy. Needs to be >1 for cluster usage. # PUBLIC_CLOUD_INSTANCE_TYPE - VM size, sets terraform 'vm_size' parameter # USE_SAPCONF - (true/false) set 'false' to use saptune -# HANA_OS_MAJOR_VERSION - sets 'hana_os_major_version' terraform parameter - default is taken from 'VERSION' # FENCING_MECHANISM - (sbd/native) choose fencing mechanism # QESAP_SCC_NO_REGISTER - define variable in openqa to skip SCC registration via ANSIBLE # HANA_MEDIA - Hana install media directory