Merge pull request #822 from yeoldegrove/master_aws_nitro

aws: master: change instances types from xen to nitro (KVM)

Author: yeoldegrove

aws/main.tf

@@ -128,6 +128,10 @@ module "common_variables" {
   netweaver_ha_enabled                = var.netweaver_ha_enabled
   netweaver_cluster_fencing_mechanism = var.netweaver_cluster_fencing_mechanism
   netweaver_sbd_storage_type          = var.sbd_storage_type
+  drbd_cluster_vip                    = local.drbd_cluster_vip
+  drbd_cluster_vip_mechanism          = ""
+  drbd_cluster_fencing_mechanism      = var.drbd_cluster_fencing_mechanism
+  drbd_sbd_storage_type               = var.sbd_storage_type
 }
 
 module "drbd_node" {
@@ -148,8 +152,6 @@ module "drbd_node" {
   aws_access_key_id     = var.aws_access_key_id
   aws_secret_access_key = var.aws_secret_access_key
   host_ips              = local.drbd_ips
-  fencing_mechanism     = var.drbd_cluster_fencing_mechanism
-  drbd_cluster_vip      = local.drbd_cluster_vip
   drbd_data_disk_size   = var.drbd_data_disk_size
   drbd_data_disk_type   = var.drbd_data_disk_type
   cluster_ssh_pub       = var.cluster_ssh_pub

aws/modules/drbd_node/main.tf

@@ -21,7 +21,7 @@ resource "aws_route_table_association" "drbd-subnet-route-association" {
 resource "aws_route" "drbd-cluster-vip" {
   count                  = var.drbd_count > 0 ? 1 : 0
   route_table_id         = var.route_table_id
-  destination_cidr_block = "${var.drbd_cluster_vip}/32"
+  destination_cidr_block = "${var.common_variables["drbd"]["cluster_vip"]}/32"
   instance_id            = aws_instance.drbd.0.id
 }
 
@@ -63,7 +63,7 @@ resource "aws_instance" "drbd" {
   ebs_block_device {
     volume_type = var.drbd_data_disk_type
     volume_size = var.drbd_data_disk_size
-    device_name = "/dev/xvdd"
+    device_name = "/dev/sdb"
   }
 
   volume_tags = {

aws/modules/drbd_node/salt_provisioner.tf

@@ -21,6 +21,7 @@ resource "null_resource" "drbd_provisioner" {
     content     = <<EOF
 role: drbd_node
 ${var.common_variables["grains_output"]}
+${var.common_variables["drbd_grains_output"]}
 region: ${var.aws_region}
 name_prefix: ${var.name}
 aws_cluster_profile: Cluster
@@ -32,9 +33,7 @@ hostname: ${var.name}0${count.index + 1}
 network_domain: ${var.network_domain}
 host_ips: [${join(", ", formatlist("'%s'", var.host_ips))}]
 host_ip: ${element(var.host_ips, count.index)}
-fencing_mechanism: ${var.fencing_mechanism}
-drbd_disk_device: /dev/xvdd
-drbd_cluster_vip: ${var.drbd_cluster_vip}
+drbd_disk_device: /dev/nvme1n1
 route_table: ${var.route_table_id}
 sbd_lun_index: 2
 iscsi_srv_ip: ${var.iscsi_srv_ip}

aws/modules/drbd_node/variables.tf

@@ -73,16 +73,6 @@ variable "host_ips" {
   type        = list(string)
 }
 
-variable "fencing_mechanism" {
-  description = "Choose the fencing mechanism for the cluster. Options: sbd, native"
-  type        = string
-}
-
-variable "drbd_cluster_vip" {
-  description = "IP address used to configure the drbd cluster floating IP. It must be in other subnet than the machines!"
-  type        = string
-}
-
 variable "drbd_data_disk_size" {
   description = "Disk size of the disks used to store drbd content"
   type        = string

aws/modules/hana_node/main.tf

@@ -1,7 +1,5 @@
-
 locals {
-  hana_disk_device = "/dev/xvdd"
-  create_ha_infra  = var.hana_count > 1 && var.common_variables["hana"]["ha_enabled"] ? 1 : 0
+  create_ha_infra = var.hana_count > 1 && var.common_variables["hana"]["ha_enabled"] ? 1 : 0
 }
 
 # Network resources: subnets, routes, etc
@@ -76,7 +74,7 @@ resource "aws_instance" "clusternodes" {
   ebs_block_device {
     volume_type = var.hana_data_disk_type
     volume_size = var.hana_data_disk_size
-    device_name = local.hana_disk_device
+    device_name = "/dev/sdb"
   }
 
   volume_tags = {

aws/modules/hana_node/salt_provisioner.tf

@@ -35,7 +35,7 @@ host_ips: [${join(", ", formatlist("'%s'", var.host_ips))}]
 network_domain: "tf.local"
 sbd_lun_index: 0
 iscsi_srv_ip: ${var.iscsi_srv_ip}
-hana_disk_device: ${local.hana_disk_device}
+hana_disk_device: /dev/nvme1n1
 cluster_ssh_pub:  ${var.cluster_ssh_pub}
 cluster_ssh_key: ${var.cluster_ssh_key}
 EOF

aws/modules/iscsi_server/main.tf

@@ -1,9 +1,5 @@
 # iscsi server resources
 
-locals {
-  iscsi_device_name = "/dev/xvdd"
-}
-
 module "get_os_image" {
   source   = "../../modules/get_os_image"
   os_image = var.os_image
@@ -29,7 +25,7 @@ resource "aws_instance" "iscsisrv" {
   ebs_block_device {
     volume_type = "gp2"
     volume_size = var.iscsi_disk_size
-    device_name = local.iscsi_device_name
+    device_name = "/dev/sdb"
   }
 
   volume_tags = {

aws/modules/iscsi_server/salt_provisioner.tf

@@ -18,7 +18,7 @@ role: iscsi_srv
 ${var.common_variables["grains_output"]}
 region: ${var.aws_region}
 iscsi_srv_ip: ${element(aws_instance.iscsisrv.*.private_ip, count.index)}
-iscsidev: ${local.iscsi_device_name}
+iscsidev: /dev/nvme1n1
 ${yamlencode(
     { partitions : { for index in range(var.lun_count) :
       tonumber(index + 1) => {

aws/modules/monitoring/main.tf

@@ -23,7 +23,7 @@ resource "aws_instance" "monitoring" {
   ebs_block_device {
     volume_type = "gp2"
     volume_size = "10"
-    device_name = "/dev/xvdd"
+    device_name = "/dev/sdb"
   }
 
   volume_tags = {

aws/modules/netweaver_node/main.tf

@@ -98,7 +98,7 @@ resource "aws_instance" "netweaver" {
   ebs_block_device {
     volume_type = "gp2"
     volume_size = "60"
-    device_name = "/dev/xvdd"
+    device_name = "/dev/sdb"
   }
 
   volume_tags = {