Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove all bastion code from Azure #171

Merged
merged 1 commit into from
Aug 8, 2023
Merged

Remove all bastion code from Azure #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion terraform/azure/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Azure Public Cloud deployment with Terraform and Ansible

* [Quickstart](#quickstart)
* [Bastion](#bastion)
* [High level description](#high-level-description)
* [Customization](#customization)
* [QA deployment](#qa-deployment)
Expand Down
5 changes: 0 additions & 5 deletions terraform/azure/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ module "drbd_node" {
common_variables = module.common_variables.configuration
name = var.drbd_name
network_domain = var.drbd_network_domain == "" ? var.network_domain : var.drbd_network_domain
bastion_host = ""
az_region = var.az_region
drbd_count = var.drbd_enabled == true ? 2 : 0
vm_size = var.drbd_vm_size
Expand All @@ -164,7 +163,6 @@ module "netweaver_node" {
common_variables = module.common_variables.configuration
name = var.netweaver_name
network_domain = var.netweaver_network_domain == "" ? var.network_domain : var.netweaver_network_domain
bastion_host = ""
az_region = var.az_region
xscs_server_count = local.netweaver_xscs_server_count
app_server_count = var.netweaver_enabled ? var.netweaver_app_server_count : 0
Expand Down Expand Up @@ -203,7 +201,6 @@ module "hana_node" {
common_variables = module.common_variables.configuration
name = var.hana_name
network_domain = var.hana_network_domain == "" ? var.network_domain : var.hana_network_domain
bastion_host = ""
az_region = var.az_region
hana_count = var.hana_count
vm_size = var.hana_vm_size
Expand Down Expand Up @@ -241,7 +238,6 @@ module "monitoring" {
common_variables = module.common_variables.configuration
name = var.monitoring_name
network_domain = var.monitoring_network_domain == "" ? var.network_domain : var.monitoring_network_domain
bastion_host = ""
monitoring_enabled = var.monitoring_enabled
az_region = var.az_region
vm_size = var.monitoring_vm_size
Expand All @@ -258,7 +254,6 @@ module "iscsi_server" {
common_variables = module.common_variables.configuration
name = var.iscsi_name
network_domain = var.iscsi_network_domain == "" ? var.network_domain : var.iscsi_network_domain
bastion_host = ""
iscsi_count = local.iscsi_enabled ? var.iscsi_count : 0
az_region = var.az_region
vm_size = var.iscsi_vm_size
Expand Down
148 changes: 0 additions & 148 deletions terraform/azure/modules/bastion/main.tf
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions terraform/azure/modules/bastion/outputs.tf
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions terraform/azure/modules/bastion/variables.tf
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions terraform/azure/modules/drbd_node/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ variable "common_variables" {
description = "Output of the common_variables module"
}

variable "bastion_host" {
description = "Bastion host address"
type = string
default = ""
}

variable "az_region" {
type = string
default = "westeurope"
Expand Down
1 change: 0 additions & 1 deletion terraform/azure/modules/hana_node/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,6 @@ module "hana_majority_maker" {
node_count = local.create_scale_out
name = var.name
common_variables = var.common_variables
bastion_host = var.bastion_host
az_region = var.az_region
vm_size = var.majority_maker_vm_size
hana_count = var.hana_count
Expand Down
6 changes: 0 additions & 6 deletions terraform/azure/modules/hana_node/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ variable "common_variables" {
description = "Output of the common_variables module"
}

variable "bastion_host" {
description = "Bastion host address"
type = string
default = ""
}

variable "az_region" {
type = string
default = "westeurope"
Expand Down
6 changes: 0 additions & 6 deletions terraform/azure/modules/iscsi_server/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ variable "common_variables" {
description = "Output of the common_variables module"
}

variable "bastion_host" {
description = "Bastion host address"
type = string
default = ""
}

variable "az_region" {
type = string
default = "westeurope"
Expand Down
6 changes: 0 additions & 6 deletions terraform/azure/modules/majority_maker_node/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ variable "common_variables" {
description = "Output of the common_variables module"
}

variable "bastion_host" {
description = "Bastion host address"
type = string
default = ""
}

variable "az_region" {
type = string
default = "westeurope"
Expand Down
6 changes: 0 additions & 6 deletions terraform/azure/modules/monitoring/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ variable "common_variables" {
description = "Output of the common_variables module"
}

variable "bastion_host" {
description = "Bastion host address"
type = string
default = ""
}

variable "monitoring_enabled" {
description = "enable the host to be monitored by exporters, e.g node_exporter"
type = bool
Expand Down
6 changes: 0 additions & 6 deletions terraform/azure/modules/netweaver_node/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ variable "common_variables" {
description = "Output of the common_variables module"
}

variable "bastion_host" {
description = "Bastion host address"
type = string
default = ""
}

variable "az_region" {
type = string
default = "westeurope"
Expand Down
12 changes: 0 additions & 12 deletions terraform/azure/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,6 @@ variable "authorized_keys" {
default = []
}

variable "bastion_name" {
description = "hostname, without the domain part"
type = string
default = "vmbastion"
}

variable "bastion_network_domain" {
description = "hostname's network domain"
type = string
default = ""
}

# Deployment variables
variable "deployment_name" {
description = "Suffix string added to some of the infrastructure resources names. If it is not provided, the terraform workspace string is used as suffix"
Expand Down