Remove more Salt provisioning and bastion code

terraform/aws/terraform.tfvars.example

@@ -1,6 +1,5 @@
 #################################
 # qe-sap-deployments project configuration file
-# base on ha-sap-terraform-deployments project
 # Find all the available variables and definitions in the variables.tf file
 #################################
 

terraform/azure/terraform.tfvars.example

@@ -1,5 +1,5 @@
 #################################
-# ha-sap-terraform-deployments project configuration file
+# qe-sa-deployment project configuration file
 # Find all the available variables and definitions in the variables.tf file
 #################################
 
@@ -63,15 +63,6 @@ public_key  = "/home/user/.ssh/id.rsa.key"
 # Other deployment options
 ##########################
 
-# Repository url used to install HA/SAP deployment packages
-# It contains the salt formulas rpm packages and other dependencies.
-#
-## Specific Release - for latest release look at https://github.com/SUSE/ha-sap-terraform-deployments/releases
-# To auto detect the SLE version
-#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/"
-# Otherwise use a specific SLE version:
-#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/SLE_15_SP3/"
-#
 ## Development Release (use if on `develop` branch)
 # To auto detect the SLE version
 #ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/"
@@ -83,12 +74,6 @@ public_key  = "/home/user/.ssh/id.rsa.key"
 
 # Test and QA purpose
 
-# Define if the deployment is used for testing purpose
-# Disable all extra packages that do not come from the image
-# Except salt-minion (for the moment) and salt formulas
-# true or false (default)
-#offline_mode = false
-
 # Execute HANA Hardware Configuration Check Tool to bench filesystems
 # true or false (default)
 #hwcct = false

terraform/azure/variables.tf

@@ -162,16 +162,6 @@ variable "additional_packages" {
   default     = []
 }
 
-# Repository url used to install development versions of HA/SAP deployment packages
-# The latest RPM packages can be found at:
-# https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/{YOUR SLE VERSION}
-# Contains the salt formulas rpm packages.
-variable "ha_sap_deployment_repo" {
-  description = "Repository url used to install development versions of HA/SAP deployment packages. If the SLE version is not present in the URL, it will be automatically detected"
-  type        = string
-  default     = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8"
-}
-
 # Hana related variables
 variable "hana_name" {
   description = "hostname, without the domain part"
@@ -848,16 +838,8 @@ variable "netweaver_shared_storage_type" {
 
 # Testing and QA
 
-# Disable extra package installation (sap, ha pattern etc).
-# Disables first registration to install salt-minion, it is considered that images are delivered with salt-minion
-variable "offline_mode" {
-  description = "Disable installation of extra packages usage not coming with the image"
-  type        = bool
-  default     = false
-}
-
 # Execute HANA Hardware Configuration Check Tool to bench filesystems.
-# The test takes several hours. See results in /root/hwcct_out and in global log file /var/log/salt-result.log.
+# The test takes several hours. See results in /root/hwcct_out
 variable "hwcct" {
   description = "Execute HANA Hardware Configuration Check Tool to bench filesystems"
   type        = bool

terraform/gcp/terraform.tfvars.example

@@ -1,5 +1,5 @@
 #################################
-# ha-sap-terraform-deployments project configuration file
+# qe-sa-deployment project configuration file
 # Find all the available variables and definitions in the variables.tf file
 #################################
 
@@ -86,15 +86,6 @@ private_key = "/home/myuser/.ssh/id_rsa"
 # Other deployment options
 ##########################
 
-# Repository url used to install HA/SAP deployment packages
-# It contains the salt formulas rpm packages and other dependencies.
-#
-## Specific Release - for latest release look at https://github.com/SUSE/ha-sap-terraform-deployments/releases
-# To auto detect the SLE version
-#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/"
-# Otherwise use a specific SLE version:
-#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8/SLE_15_SP3/"
-#
 ## Development Release (use if on `develop` branch)
 # To auto detect the SLE version
 #ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/"
@@ -109,12 +100,6 @@ private_key = "/home/myuser/.ssh/id_rsa"
 
 # QA variables
 
-# Define if the deployment is used for testing purpose
-# Disable all extra packages that do not come from the image
-# Except salt-minion (for the moment) and salt formulas
-# true or false (default)
-#offline_mode = false
-
 # Execute HANA Hardware Configuration Check Tool to bench filesystems
 # true or false (default)
 #hwcct = false

terraform/gcp/variables.tf

@@ -140,16 +140,6 @@ variable "additional_packages" {
   default     = []
 }
 
-# Repository url used to install development versions of HA/SAP deployment packages
-# The latest RPM packages can be found at:
-# https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/{YOUR SLE VERSION}
-# Contains the salt formulas rpm packages.
-variable "ha_sap_deployment_repo" {
-  description = "Repository url used to install development versions of HA/SAP deployment packages. If the SLE version is not present in the URL, it will be automatically detected"
-  type        = string
-  default     = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:v8"
-}
-
 # Hana related variables
 
 variable "hana_name" {

terraform/generic_modules/common_variables/outputs.tf

@@ -9,9 +9,6 @@ locals {
     )
   )
 
-  bastion_private_key = var.bastion_private_key != "" ? (fileexists(var.bastion_private_key) ? file(var.bastion_private_key) : var.bastion_private_key) : local.private_key
-  bastion_public_key  = var.bastion_public_key != "" ? (fileexists(var.bastion_public_key) ? file(var.bastion_public_key) : var.bastion_public_key) : local.public_key
-
   requirements_file = "${path.module}/../../requirements.yml"
   requirements      = fileexists(local.requirements_file) ? yamlencode({ pkg_requirements : yamldecode(trimspace(file(local.requirements_file))) }) : yamlencode({ pkg_requirements : null })
 }
@@ -30,8 +27,6 @@ output "configuration" {
     public_key                  = local.public_key
     private_key                 = local.private_key
     authorized_keys             = var.authorized_keys
-    bastion_public_key          = local.bastion_public_key
-    bastion_private_key         = local.bastion_private_key
     authorized_user             = var.authorized_user
     provisioner                 = var.provisioner
     monitoring_enabled          = var.monitoring_enabled

terraform/generic_modules/common_variables/variables.tf

@@ -77,23 +77,6 @@ variable "authorized_user" {
   type        = string
 }
 
-variable "bastion_public_key" {
-  description = "Path to a SSH public key used to connect to the bastion. If it's not set the key provided in public_key_location will be used"
-  type        = string
-  default     = ""
-}
-
-variable "bastion_private_key" {
-  description = "Path to a SSH private key used to connect to the bastion. If it's not set the key provided in private_key_location will be used"
-  type        = string
-  default     = ""
-}
-
-variable "provisioner" {
-  description = "Used provisioner option. Available options: salt. Let empty to not use any provisioner"
-  default     = "salt"
-}
-
 variable "monitoring_enabled" {
   description = "Enable centralized monitoring via Prometheus/Grafana/Loki"
   type        = bool