Skip to content

Remove use_sbd from the inventory #370

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

Open
mpagot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove use_sbd from the inventory #370

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/aws/inventory.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
all:
vars:
cloud_platform_name: aws
use_sbd: ${use_sbd}
aws_route_table_id: ${routetable_id}
cluster_ip: ${cluster_ip}
aws_stonith_tag: ${stonith_tag}
Expand Down
1 change: 0 additions & 1 deletion terraform/aws/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ resource "local_file" "ansible_inventory" {
iscsi_enabled = local.iscsi_enabled,
iscsi_remote_python = var.iscsi_remote_python,
iscsi_machinetype = var.iscsi_instancetype,
use_sbd = local.use_sbd,
routetable_id = aws_route_table.route-table.id,
cluster_ip = local.hana_cluster_vip,
stonith_tag = module.hana_node.stonith_tag,
Expand Down
1 change: 0 additions & 1 deletion terraform/azure/inventory.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
all:
vars:
cloud_platform_name: azure
use_sbd: ${use_sbd}
resource_group_name: ${resource_group_name}
subscription_id: ${subscription_id}
tenant_id: ${tenant_id}
Expand Down
1 change: 0 additions & 1 deletion terraform/azure/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ resource "local_file" "ansible_inventory" {
iscsi_pip = module.iscsi_server.iscsisrv_public_ip,
iscsi_enabled = local.iscsi_enabled,
iscsi_remote_python = var.iscsi_remote_python
use_sbd = local.use_sbd
resource_group_name = local.resource_group_name
subscription_id = data.azurerm_subscription.current.subscription_id
tenant_id = data.azurerm_subscription.current.tenant_id
Expand Down
1 change: 0 additions & 1 deletion terraform/gcp/inventory.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
all:
vars:
cloud_platform_name: gcp
use_sbd: ${use_sbd}
cluster_ip: ${cluster_ip}
prefix: ${name_prefix}
project: ${gcp_project}
Expand Down
1 change: 0 additions & 1 deletion terraform/gcp/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ resource "local_file" "ansible_inventory" {
gcp_project = var.project,
gcp_primary_zone = element(local.compute_zones, 0),
gcp_secondary_zone = element(local.compute_zones, 1),
use_sbd = local.use_sbd
name_prefix = local.deployment_name,
})
filename = "inventory.yaml"
Expand Down
5 changes: 0 additions & 5 deletions terraform/libvirt/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ locals {
netweaver_virtual_ips = length(var.netweaver_virtual_ips) != 0 ? var.netweaver_virtual_ips : [for ip_index in range(local.netweaver_ip_start, local.netweaver_ip_start + local.netweaver_virtual_ips_count) : cidrhost(local.iprange, ip_index + local.netweaver_virtual_ips_count)]

# Check if iscsi server has to be created
use_sbd = (
var.hana_cluster_fencing_mechanism == "sbd" ||
var.drbd_cluster_fencing_mechanism == "sbd" ||
var.netweaver_cluster_fencing_mechanism == "sbd"
)
iscsi_enabled = (
var.sbd_storage_type == "iscsi" &&
(
Expand Down
1 change: 0 additions & 1 deletion tools/inventory.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
all:
vars:
use_sbd: true
resource_group_name: rg-name
subscription_id: AAAAA-BBBBB-CCCCC-DDDDD
tenant_id: EEEEE-FFFFF-GGGGG-HHHHH
Expand Down