From 0fab6a7089fe9e580dd9cf16bf59b5e5737488d5 Mon Sep 17 00:00:00 2001
From: Feilong Wang <flwang@catalyst.net.nz>
Date: Wed, 27 Nov 2019 22:26:45 +1300
Subject: [PATCH] [k8s] Support docker storage driver for fedora coreos

Task: 37643
Story: 2005201

Change-Id: I1a75f1bf12747508a3497293650d3cc668202de6
---
 ...ure_docker_storage_driver_fedora_coreos.sh | 55 +++++++++++++++++++
 .../templates/kubemaster.yaml                 |  5 +-
 ...er-for-fedora-coreos-697ffcc47e7e8359.yaml |  5 ++
 3 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 magnum/drivers/common/templates/fragments/configure_docker_storage_driver_fedora_coreos.sh
 create mode 100644 releasenotes/notes/support-docker-storage-driver-for-fedora-coreos-697ffcc47e7e8359.yaml

diff --git a/magnum/drivers/common/templates/fragments/configure_docker_storage_driver_fedora_coreos.sh b/magnum/drivers/common/templates/fragments/configure_docker_storage_driver_fedora_coreos.sh
new file mode 100644
index 0000000000..91b49da505
--- /dev/null
+++ b/magnum/drivers/common/templates/fragments/configure_docker_storage_driver_fedora_coreos.sh
@@ -0,0 +1,55 @@
+ssh_cmd="ssh -F /srv/magnum/.ssh/config root@localhost"
+
+configure_storage_driver_generic() {
+
+    cat > /etc/systemd/system/var-lib-docker.mount <<EOF
+[Unit]
+Description=Mount ephemeral to /var/lib/docker
+
+[Mount]
+What=/dev/vdb
+Where=/var/lib/docker
+Type=ext4
+
+[Install]
+WantedBy=local-fs.target
+EOF
+
+
+    cat > /etc/sysconfig/enable-docker-mount.sh <<EOF
+#!/bin/sh
+. /etc/sysconfig/heat-params
+if [  -n "$DOCKER_VOLUME_SIZE" ] && [ "$DOCKER_VOLUME_SIZE" -gt 0 ]; then
+    if [[ "$(blkid -o value -s TYPE /dev/vdb)" -eq 0 ]]; then
+        systemctl daemon-reload
+        systemctl start var-lib-docker.mount
+        systemctl enable var-lib-docker.mount
+    else
+        mkfs -t ext4 /dev/vdb
+        systemctl daemon-reload
+        systemctl start var-lib-docker.mount
+        systemctl enable var-lib-docker.mount
+    fi
+fi
+EOF
+
+    chmod +x /etc/sysconfig/enable-docker-mount.sh
+
+    cat > /etc/systemd/system/enable-docker-mount.service <<EOF
+[Unit]
+Description=Mount docker volume
+
+[Service]
+Type=oneshot
+EnvironmentFile=/etc/sysconfig/heat-params
+ExecStart=/etc/sysconfig/enable-docker-mount.sh
+
+[Install]
+RequiredBy=multi-user.target
+EOF
+
+}
+
+configure_devicemapper() {
+    configure_storage_driver_generic
+}
\ No newline at end of file
diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml
index 4b15a4e412..1b837c7727 100644
--- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml
+++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubemaster.yaml
@@ -754,7 +754,10 @@ resources:
             - get_file: ../../common/templates/kubernetes/fragments/configure-etcd.sh
             - get_file: ../../common/templates/kubernetes/fragments/write-kube-os-config.sh
             - get_file: ../../common/templates/kubernetes/fragments/configure-kubernetes-master.sh
-              # TODO add docker_storage_setup
+            - str_replace:
+                template: {get_file: ../../common/templates/fragments/configure-docker-storage.sh}
+                params:
+                  $configure_docker_storage_driver: {get_file: ../../common/templates/fragments/configure_docker_storage_driver_fedora_coreos.sh}
             - get_file: ../../common/templates/kubernetes/fragments/enable-services-master.sh
             - get_file: ../../common/templates/kubernetes/fragments/add-proxy.sh
 
diff --git a/releasenotes/notes/support-docker-storage-driver-for-fedora-coreos-697ffcc47e7e8359.yaml b/releasenotes/notes/support-docker-storage-driver-for-fedora-coreos-697ffcc47e7e8359.yaml
new file mode 100644
index 0000000000..d7d6a26214
--- /dev/null
+++ b/releasenotes/notes/support-docker-storage-driver-for-fedora-coreos-697ffcc47e7e8359.yaml
@@ -0,0 +1,5 @@
+---
+issues:
+  - |
+    Now Fedora CoreOS driver can support using docker storage driver,
+    only overlay2 is supported.