From 55931f3dbd0daf71521525aa3c920c35998cd261 Mon Sep 17 00:00:00 2001 From: Eike Waldt Date: Wed, 24 Aug 2022 08:54:20 +0200 Subject: [PATCH 1/2] fix aws after simplifying HANA lvm code to work on SLES12 --- aws/modules/hana_node/salt_provisioner.tf | 2 +- salt/hana_node/mount/lvm.sls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws/modules/hana_node/salt_provisioner.tf b/aws/modules/hana_node/salt_provisioner.tf index cd49f3b4..e33f277e 100644 --- a/aws/modules/hana_node/salt_provisioner.tf +++ b/aws/modules/hana_node/salt_provisioner.tf @@ -42,7 +42,7 @@ iscsi_srv_ip: ${var.iscsi_srv_ip} cluster_ssh_pub: ${var.cluster_ssh_pub} cluster_ssh_key: ${var.cluster_ssh_key} node_count: ${var.hana_count + local.create_scale_out} -hana_data_disks_configuration: {${join(", ", formatlist("'%s': '%s'", keys(var.hana_data_disks_configuration), values(var.hana_data_disks_configuration), ), formatlist("'%s': '%s'", "devices", join(",", aws_instance.hana[count.index].ebs_block_device.*.volume_id)), )}} +hana_data_disks_configuration: {${join(", ", formatlist("'%s': '%s'", keys(var.hana_data_disks_configuration), values(var.hana_data_disks_configuration), ), formatlist("'%s': '%s'", "devices", replace(join(",", aws_instance.hana[count.index].ebs_block_device.*.volume_id), "-", "")), )}} efs_mount_ip: ${local.shared_storage_efs == 1 && !contains(split("#", lookup(var.hana_data_disks_configuration, "names", "")), "shared") ? "shared: [ ${join(", ", aws_efs_file_system.scale-out-efs-shared.*.dns_name)} ]" : ""} majority_maker_node: ${local.create_scale_out == 1 ? "${local.hostname}mm" : ""} diff --git a/salt/hana_node/mount/lvm.sls b/salt/hana_node/mount/lvm.sls index aa62c004..c3b4a8a3 100644 --- a/salt/hana_node/mount/lvm.sls +++ b/salt/hana_node/mount/lvm.sls @@ -2,7 +2,7 @@ # define device naming scheme based on cloud provider {% if grains['provider'] == 'aws' %} - {%- set device_path = '/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol' %} + {%- set device_path = '/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_' %} {% elif grains['provider'] == 'azure' %} {%- set device_path = '/dev/disk/azure/scsi1/lun' %} {% elif grains['provider'] == 'gcp' %} From 016f9873f94d90a62c0ad3d941ef603a9ea0da61 Mon Sep 17 00:00:00 2001 From: Eike Waldt Date: Wed, 24 Aug 2022 11:44:45 +0200 Subject: [PATCH 2/2] fix netweaver sapmnt on azure and ANF --- pillar_examples/automatic/netweaver/netweaver.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pillar_examples/automatic/netweaver/netweaver.sls b/pillar_examples/automatic/netweaver/netweaver.sls index 9d2187ca..c263ec7f 100644 --- a/pillar_examples/automatic/netweaver/netweaver.sls +++ b/pillar_examples/automatic/netweaver/netweaver.sls @@ -44,7 +44,7 @@ netweaver: {%- if grains['provider'] == 'aws' and grains['netweaver_shared_storage_type'] == 'efs' %} sapmnt_inst_media: "{{ grains['efs_mount_ip']['sapmnt'][0] }}:/" {%- elif grains['provider'] == 'azure' and grains['netweaver_shared_storage_type'] == 'anf' %} - sapmnt_inst_media: "{{ grains['anf_mount_ip']['sapmnt'][0] }}:/netweaver_sapmnt" + sapmnt_inst_media: "{{ grains['anf_mount_ip']['sapmnt'][0] }}:/netweaver-sapmnt" {%- elif grains['provider'] == 'gcp' and grains['netweaver_shared_storage_type'] == 'filestore' %} sapmnt_inst_media: "{{ grains['filestore_mount_ip']['sapmnt'][0] }}:/netweaver_sapmnt" {%- else %}