Remove more Salt provisioning and bastion code (#179)

Remove terraform code about Salt as the project is using Ansible Remove more bastion code Remove offline_mode
SUSE · Oct 3, 2023 · e56ad98 · e56ad98
1 parent 137e0fb
commit e56ad98
Show file tree

Hide file tree

Showing 24 changed files with 16 additions and 506 deletions.
diff --git a/terraform/aws/README.md b/terraform/aws/README.md
@@ -175,14 +175,6 @@ By default it creates 3 instances in AWS: one for support services (mainly iSCSI
 
 In order to deploy the environment, different configurations are available through the terraform variables. These variables can be configured using a `terraform.tfvars` file. An example is available in [terraform.tfvars.example](./terraform.tvars.example). To find all the available variables check the [variables.tf](./variables.tf) file.
 
-### QA deployment
-
-The project has been created in order to provide the option to run the deployment in a `Test` or `QA` mode. This mode only enables the packages coming properly from SLE channels, so no other packages will be used. Set `offline_mode = true` in `terraform.tfvars` to enable it.
-
-### Pillar files configuration
-
-Besides the `terraform.tfvars` file usage to configure the deployment, a more advanced configuration is available through pillar files customization. Find more information [here](../pillar_examples/README.md).
-
 ### Use already existing network resources
 
 The usage of already existing network resources (vpc and security groups) can be done configuring the `terraform.tfvars` file and adjusting some variables. The example of how to use them is available at [terraform.tfvars.example](terraform.tfvars.example).

diff --git a/terraform/aws/main.tf b/terraform/aws/main.tf
@@ -77,7 +77,6 @@ module "common_variables" {
   authorized_user                     = var.admin_user
   monitoring_enabled                  = var.monitoring_enabled
   monitoring_srv_ip                   = var.monitoring_enabled ? local.monitoring_ip : ""
-  offline_mode                        = var.offline_mode
   hana_hwcct                          = var.hwcct
   hana_sid                            = var.hana_sid
   hana_instance_number                = var.hana_instance_number

diff --git a/terraform/aws/terraform.tfvars.example b/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
 #################################
 

diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf
@@ -775,13 +775,6 @@ variable "netweaver_shared_storage_type" {
 
 # Testing and QA variables
 
-# Disable extra package installation (sap, ha pattern etc).
-variable "offline_mode" {
-  description = "Disable installation of extra packages usage not coming with the image"
-  type        = bool
-  default     = true
-}
-
 # 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.
 variable "hwcct" {

diff --git a/terraform/azure/README.md b/terraform/azure/README.md
@@ -117,14 +117,6 @@ Once the infrastructure is created by Terraform, the servers are provisioned wit
 
 In order to deploy the environment, different configurations are available through the terraform variables. These variables can be configured using a `terraform.tfvars` file. An example is available in [terraform.tfvars.example](./terraform.tvars.example). To find all the available variables check the [variables.tf](./variables.tf) file.
 
-### QA deployment
-
-The project has been created in order to provide the option to run the deployment in a `Test` or `QA` mode. This mode only enables the packages coming properly from SLE channels, so no other packages will be used. Set `offline_mode = true` in `terraform.tfvars` to enable it.
-
-### Pillar files configuration
-
-Besides the `terraform.tfvars` file usage to configure the deployment, a more advanced configuration is available through pillar files customization. Find more information [here](../pillar_examples/README.md).
-
 ### Use already existing network resources
 
 The usage of already existing network resources (virtual network and subnets) can be done configuring

diff --git a/terraform/azure/main.tf b/terraform/azure/main.tf
@@ -72,14 +72,12 @@ module "common_variables" {
   reg_code                            = var.reg_code
   reg_email                           = var.reg_email
   reg_additional_modules              = var.reg_additional_modules
-  ha_sap_deployment_repo              = var.ha_sap_deployment_repo
   additional_packages                 = var.additional_packages
   public_key                          = var.public_key
   authorized_keys                     = var.authorized_keys
   authorized_user                     = var.admin_user
   monitoring_enabled                  = var.monitoring_enabled
   monitoring_srv_ip                   = var.monitoring_enabled ? local.monitoring_ip : ""
-  offline_mode                        = var.offline_mode
   hana_hwcct                          = var.hwcct
   hana_sid                            = var.hana_sid
   hana_instance_number                = var.hana_instance_number

diff --git a/terraform/azure/terraform.tfvars.example b/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,32 +63,11 @@ 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/"
-# Otherwise use a specific SLE version:
-#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/SLE_15_SP3/"
-
 # Enable pre deployment steps (disabled by default)
 #pre_deployment = true
 
 # 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

diff --git a/terraform/azure/variables.tf b/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

diff --git a/terraform/gcp/README.md b/terraform/gcp/README.md
@@ -103,14 +103,6 @@ By default, this configuration creates 3 instances in GCP: one for support servi
 
 In order to deploy the environment, different configurations are available through the terraform variables. These variables can be configured using a `terraform.tfvars` file. An example is available in [terraform.tfvars.example](./terraform.tvars.example). To find all the available variables check the [variables.tf](./variables.tf) file.
 
-## QA deployment
-
-The project has been created in order to provide the option to run the deployment in a `Test` or `QA` mode. This mode only enables the packages coming properly from SLE channels, so no other packages will be used. Set `offline_mode = true` in `terraform.tfvars` to enable it.
-
-## Pillar files configuration
-
-Besides the `terraform.tfvars` file usage to configure the deployment, a more advanced configuration is available through pillar files customization. Find more information [here](../pillar_examples/README.md).
-
 ## Use already existing network resources
 
 The usage of already existing network resources (vpc, subnet, firewall rules, etc) can be done configuring

diff --git a/terraform/gcp/main.tf b/terraform/gcp/main.tf
@@ -83,7 +83,6 @@ module "common_variables" {
   reg_code                    = var.reg_code
   reg_email                   = var.reg_email
   reg_additional_modules      = var.reg_additional_modules
-  ha_sap_deployment_repo      = var.ha_sap_deployment_repo
   additional_packages         = var.additional_packages
   public_key                  = var.public_key
   private_key                 = var.private_key
@@ -92,7 +91,6 @@ module "common_variables" {
 
   monitoring_enabled                  = var.monitoring_enabled
   monitoring_srv_ip                   = var.monitoring_enabled ? local.monitoring_srv_ip : ""
-  offline_mode                        = var.offline_mode
   hana_hwcct                          = var.hwcct
   hana_sid                            = var.hana_sid
   hana_instance_number                = var.hana_instance_number

diff --git a/terraform/gcp/modules/bastion/main.tf b/terraform/gcp/modules/bastion/main.tf
diff --git a/terraform/gcp/modules/bastion/outputs.tf b/terraform/gcp/modules/bastion/outputs.tf
diff --git a/terraform/gcp/modules/bastion/variables.tf b/terraform/gcp/modules/bastion/variables.tf
diff --git a/terraform/gcp/terraform.tfvars.example b/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,35 +86,11 @@ 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/"
-# Otherwise use a specific SLE version:
-#ha_sap_deployment_repo = "https://download.opensuse.org/repositories/network:ha-clustering:sap-deployments:devel/SLE_15_SP3/"
-
 # Enable pre deployment steps (disabled by default)
 #pre_deployment = true
 
-# To disable the provisioning process
-#provisioner = ""
-
 # 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

diff --git a/terraform/gcp/variables.tf b/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" {
@@ -766,14 +756,6 @@ variable "netweaver_shared_storage_type" {
 
 # Testing and QA variables
 
-# 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 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.
 variable "hwcct" {