Merge pull request #60 from remerge/CORE-506

Add support for SW RAID, standard data partition and private network

Author: hollow

leaseweb/server/installation/main.tf

@@ -61,29 +61,27 @@ MACAddress=${var.internal_mac}
 
 [Network]
 Address=${var.internal_ip}/16
-Gateway=10.32.0.1
-DNS=10.164.15.230
+Gateway=${var.internal_gateway}
+DNS=${var.internal_dns}
 EOR
 
 systemctl disable NetworkManager
 systemctl enable systemd-networkd
 
 cat > /etc/resolv.conf <<EOR
-nameserver 10.164.15.230
+nameserver ${var.internal_dns}
 EOR
 
-sgdisk -n 4:0:0 -t 4:8300 -c 4:data /dev/sda
-
 reboot
 EOT
 
   raid {
-    type            = "HW"
+    type            = var.raid_type
     level           = 1
     number_of_disks = 2
   }
 
-  device = "SATA_SAS"
+  device = var.device
 
   partition {
     mountpoint = "/boot"
@@ -97,15 +95,21 @@ EOT
     size       = 20480
   }
 
+  partition {
+    mountpoint = "/data"
+    filesystem = "ext4"
+    size       = "*"
+  }
+
   timeouts {
-    create = "30m"
+    create = "60m"
   }
 
   lifecycle {
+    prevent_destroy = true
     ignore_changes = [
       password,
       post_install_script,
     ]
-    prevent_destroy = true
   }
 }

leaseweb/server/installation/variables.tf

@@ -6,6 +6,16 @@ variable "hostname" {
   type = string
 }
 
+variable "raid_type" {
+  type    = string
+  default = "HW"
+}
+
+variable "device" {
+  type    = string
+  default = "SATA_SAS"
+}
+
 variable "internal_mac" {
   type = string
 }
@@ -14,6 +24,16 @@ variable "internal_ip" {
   type = string
 }
 
+variable "internal_gateway" {
+  type    = string
+  default = "10.32.0.1"
+}
+
+variable "internal_dns" {
+  type    = string
+  default = "10.164.15.230"
+}
+
 variable "enrollment_token" {
   type      = string
   sensitive = true