From ddb0dff5ab70303480ba28e43eb8292d2f086ef1 Mon Sep 17 00:00:00 2001
From: Jan Provaznik <jprovazn@redhat.com>
Date: Mon, 23 Jan 2017 12:00:11 +0100
Subject: [PATCH] Add CEPHFS manila share protocol

Allows to use OS::Manila::Share with share_protocol set to CEPHFS.

Closes-Bug: #1664574
Change-Id: Ia2ece0163a3c25eb28bc0b471cd1797d52fe4e3c
---
 heat/engine/resources/openstack/manila/share.py              | 2 +-
 .../notes/add-cephfs-share-protocol-033e091e7c6c5166.yaml    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/add-cephfs-share-protocol-033e091e7c6c5166.yaml

diff --git a/heat/engine/resources/openstack/manila/share.py b/heat/engine/resources/openstack/manila/share.py
index 43a69eadc0..80d1f2a207 100644
--- a/heat/engine/resources/openstack/manila/share.py
+++ b/heat/engine/resources/openstack/manila/share.py
@@ -78,7 +78,7 @@ class ManilaShare(resource.Resource):
             _('Share protocol supported by shared filesystem.'),
             required=True,
             constraints=[constraints.AllowedValues(
-                ['NFS', 'CIFS', 'GlusterFS', 'HDFS'])]
+                ['NFS', 'CIFS', 'GlusterFS', 'HDFS', 'CEPHFS'])]
         ),
         SIZE: properties.Schema(
             properties.Schema.INTEGER,
diff --git a/releasenotes/notes/add-cephfs-share-protocol-033e091e7c6c5166.yaml b/releasenotes/notes/add-cephfs-share-protocol-033e091e7c6c5166.yaml
new file mode 100644
index 0000000000..b90541d5de
--- /dev/null
+++ b/releasenotes/notes/add-cephfs-share-protocol-033e091e7c6c5166.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    'CEPHFS' can be used as a share protocol when using OS::Manila::Share
+    resource.