From b92d9c288e7a029015705305f691d3a0ce0f611e Mon Sep 17 00:00:00 2001
From: Hector Huertas <hectorhuertas@gmail.com>
Date: Mon, 16 Apr 2018 11:53:45 +0100
Subject: [PATCH 1/3] Replace disk-mounter module by templates

---
 cfssl.tf | 39 +++++++++++++++++++++++++++++++--------
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/cfssl.tf b/cfssl.tf
index 8161de1..285455d 100644
--- a/cfssl.tf
+++ b/cfssl.tf
@@ -36,14 +36,36 @@ data "ignition_file" "cfssl-client-config" {
   }
 }
 
-// used by the server
-module "cfssl-disk-mounter" {
-  source = "./systemd_disk_mounter"
+data "template_file" "disk-formatter" {
+  template = "${file("${path.module}/resources/disk-formatter.service")}"
 
-  volumeid   = "${var.cfssl_data_volumeid}"
-  user       = "root"
-  group      = "root"
-  mountpoint = "/var/lib/cfssl"
+  vars {
+    volumeid   = "${var.cfssl_data_volumeid}"
+    user       = "root"
+    group      = "root"
+    filesystem = "ext4"
+  }
+}
+
+data "ignition_systemd_unit" "disk-formatter" {
+  name    = "disk-formatter.service"
+  content = "${data.template_file.disk-formatter.rendered)}"
+}
+
+data "template_file" "disk-mounter" {
+  template = "${file("${path.module}/resources/disk-mounter.mount")}"
+
+  vars {
+    volumeid       = "${var.cfssl_data_volumeid}"
+    mountpoint     = "/var/lib/cfssl"
+    filesystem     = "ext4"
+    disk-formatter = "disk-formatter.service"
+  }
+}
+
+data "ignition_systemd_unit" "var-lib-cfssl-mounter" {
+  name    = "var-lib-cfssl.mount"
+  content = "${data.template_file.disk-mounter.rendered)}"
 }
 
 data "ignition_file" "cfssl-ca-csr" {
@@ -172,9 +194,10 @@ data "ignition_config" "cfssl" {
         data.ignition_systemd_unit.node-exporter.id,
         data.ignition_systemd_unit.cfssl.id,
         data.ignition_systemd_unit.cfssl-nginx.id,
+				data.ignition_systemd_unit.disk-formatter.id,
+				data.ignition_systemd_unit.var-lib-cfssl-mounter.id,
     ),
     module.cfssl-restarter.systemd_units,
-    module.cfssl-disk-mounter.systemd_units,
     var.cfssl_additional_systemd_units,
   )}"]
 }

From 2ffd3269fc328519d3ced3bafae0087c2a2ca5d8 Mon Sep 17 00:00:00 2001
From: Hector Huertas <hectorhuertas@gmail.com>
Date: Mon, 16 Apr 2018 12:51:21 +0100
Subject: [PATCH 2/3] Fix duplicated names

---
 cfssl.tf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cfssl.tf b/cfssl.tf
index 285455d..7d8f766 100644
--- a/cfssl.tf
+++ b/cfssl.tf
@@ -36,7 +36,7 @@ data "ignition_file" "cfssl-client-config" {
   }
 }
 
-data "template_file" "disk-formatter" {
+data "template_file" "cfssl-disk-formatter" {
   template = "${file("${path.module}/resources/disk-formatter.service")}"
 
   vars {
@@ -47,25 +47,25 @@ data "template_file" "disk-formatter" {
   }
 }
 
-data "ignition_systemd_unit" "disk-formatter" {
-  name    = "disk-formatter.service"
-  content = "${data.template_file.disk-formatter.rendered)}"
+data "ignition_systemd_unit" "cfssl-disk-formatter" {
+  name    = "cfssl-disk-formatter.service"
+  content = "${data.template_file.cfssl-disk-formatter.rendered}"
 }
 
-data "template_file" "disk-mounter" {
+data "template_file" "cfssl-disk-mounter" {
   template = "${file("${path.module}/resources/disk-mounter.mount")}"
 
   vars {
     volumeid       = "${var.cfssl_data_volumeid}"
     mountpoint     = "/var/lib/cfssl"
     filesystem     = "ext4"
-    disk-formatter = "disk-formatter.service"
+    disk-formatter = "cfssl-disk-formatter.service"
   }
 }
 
 data "ignition_systemd_unit" "var-lib-cfssl-mounter" {
   name    = "var-lib-cfssl.mount"
-  content = "${data.template_file.disk-mounter.rendered)}"
+  content = "${data.template_file.cfssl-disk-mounter.rendered}"
 }
 
 data "ignition_file" "cfssl-ca-csr" {
@@ -194,7 +194,7 @@ data "ignition_config" "cfssl" {
         data.ignition_systemd_unit.node-exporter.id,
         data.ignition_systemd_unit.cfssl.id,
         data.ignition_systemd_unit.cfssl-nginx.id,
-				data.ignition_systemd_unit.disk-formatter.id,
+				data.ignition_systemd_unit.cfssl-disk-formatter.id,
 				data.ignition_systemd_unit.var-lib-cfssl-mounter.id,
     ),
     module.cfssl-restarter.systemd_units,

From d2e2339e3cd36a30fd5436edf06ac614370a56eb Mon Sep 17 00:00:00 2001
From: Hector Huertas <hectorhuertas@gmail.com>
Date: Mon, 16 Apr 2018 13:27:57 +0100
Subject: [PATCH 3/3] Remove disk-mounder module folder

---
 systemd_disk_mounter/main.tf | 54 ------------------------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 systemd_disk_mounter/main.tf

diff --git a/systemd_disk_mounter/main.tf b/systemd_disk_mounter/main.tf
deleted file mode 100644
index cfddb86..0000000
--- a/systemd_disk_mounter/main.tf
+++ /dev/null
@@ -1,54 +0,0 @@
-variable "volumeid" {}
-variable "mountpoint" {}
-
-variable "user" {
-  default = "root"
-}
-
-variable "group" {
-  default = "root"
-}
-
-variable "filesystem" {
-  default = "ext4"
-}
-
-data "ignition_systemd_unit" "disk-formatter" {
-  name = "disk-formatter-${var.volumeid}.service"
-
-  content = <<EOS
-[Unit]
-Description=Format device with volume-id: ${var.volumeid}, if it has no filesystem
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-Environment=DEVICE=/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_${var.volumeid}
-ExecStart=/bin/sh -c "fsck -a $${DEVICE} || (mkfs.${var.filesystem} $${DEVICE} && mount $${DEVICE} /mnt && chown -R ${var.user}:${var.group} /mnt && umount /mnt)"
-EOS
-}
-
-data "ignition_systemd_unit" "disk-mounter" {
-  name = "${join("-", compact(split("/", var.mountpoint)))}.mount"
-
-  content = <<EOS
-[Unit]
-Description=Mount device ${var.volumeid} to ${var.mountpoint}
-Requires=${data.ignition_systemd_unit.disk-formatter.name}
-After=${data.ignition_systemd_unit.disk-formatter.name}
-[Mount]
-What=/dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_${var.volumeid}
-Where=${var.mountpoint}
-Type=${var.filesystem}
-EOS
-}
-
-output "systemd_units" {
-  value = [
-    "${data.ignition_systemd_unit.disk-formatter.id}",
-    "${data.ignition_systemd_unit.disk-mounter.id}",
-  ]
-}
-
-output "mount_unit_name" {
-  value = "${data.ignition_systemd_unit.disk-mounter.name}"
-}