Merge pull request #899 from yeoldegrove/fix/lvm_and_anf

fix aws lvm and netweaver sapmnt an azure ANF
SUSE · Aug 24, 2022 · d7a9284 · d7a9284
2 parents 3849e09 + fe452e1
commit d7a9284
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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/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 %}

diff --git 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' %}