From f75519fba5ace0fa3c3d2b83a2c7d31dadec36e1 Mon Sep 17 00:00:00 2001
From: Goutham Pacha Ravi <gouthampravi@gmail.com>
Date: Tue, 26 May 2020 22:28:48 -0700
Subject: [PATCH] Refactor cephfs element

DIB ignores a plain "install.d" directive
silently currently, producing images without
the packages we asked for.

Use the "package-installs" approach to install
element dependencies. No configuration is added
at the moment, but may be required in the future.

Also install the "fuse" package to get the ability
to execute "fusermount" command.

Change-Id: Ifbd7344b20940575348a856521539425b34a4279
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
---
 bin/manila-image-create                           | 2 +-
 elements/centos-cephfs/install.d/50-manila-cephfs | 5 -----
 elements/cephfs/README.rst                        | 5 +++++
 elements/cephfs/element-deps                      | 1 +
 elements/cephfs/package-installs.yaml             | 4 ++++
 elements/ubuntu-cephfs/install.d/50-manila-cephfs | 5 -----
 6 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100755 elements/centos-cephfs/install.d/50-manila-cephfs
 create mode 100644 elements/cephfs/README.rst
 create mode 100644 elements/cephfs/element-deps
 create mode 100644 elements/cephfs/package-installs.yaml
 delete mode 100644 elements/ubuntu-cephfs/install.d/50-manila-cephfs

diff --git a/bin/manila-image-create b/bin/manila-image-create
index 2166bb3..b741736 100755
--- a/bin/manila-image-create
+++ b/bin/manila-image-create
@@ -129,7 +129,7 @@ configure() {
     elif [ "$MANILA_SHARE_PROTO" = "zfs" ]; then
         OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS ${MANILA_DISTRO}-zfs"
     elif [ "$MANILA_SHARE_PROTO" = "cephfs" ]; then
-        OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS ${MANILA_DISTRO}-cephfs"
+        OPTIONAL_ELEMENTS="$OPTIONAL_ELEMENTS cephfs"
     fi
 
     if [ "$USE_OFFLINE_MODE" = "yes" ]; then
diff --git a/elements/centos-cephfs/install.d/50-manila-cephfs b/elements/centos-cephfs/install.d/50-manila-cephfs
deleted file mode 100755
index 17d7181..0000000
--- a/elements/centos-cephfs/install.d/50-manila-cephfs
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-install-packages ceph-common ceph-fuse crudini
diff --git a/elements/cephfs/README.rst b/elements/cephfs/README.rst
new file mode 100644
index 0000000..853fe5a
--- /dev/null
+++ b/elements/cephfs/README.rst
@@ -0,0 +1,5 @@
+======
+cephfs
+======
+
+Installs all artifacts necessary for mounting cephfs file systems.
\ No newline at end of file
diff --git a/elements/cephfs/element-deps b/elements/cephfs/element-deps
new file mode 100644
index 0000000..5de08f6
--- /dev/null
+++ b/elements/cephfs/element-deps
@@ -0,0 +1 @@
+package-installs
\ No newline at end of file
diff --git a/elements/cephfs/package-installs.yaml b/elements/cephfs/package-installs.yaml
new file mode 100644
index 0000000..4b92655
--- /dev/null
+++ b/elements/cephfs/package-installs.yaml
@@ -0,0 +1,4 @@
+fuse:
+ceph-common:
+ceph-fuse:
+crudini:
\ No newline at end of file
diff --git a/elements/ubuntu-cephfs/install.d/50-manila-cephfs b/elements/ubuntu-cephfs/install.d/50-manila-cephfs
deleted file mode 100644
index 17d7181..0000000
--- a/elements/ubuntu-cephfs/install.d/50-manila-cephfs
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-install-packages ceph-common ceph-fuse crudini