summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Provaznik <jprovazn@redhat.com>2017-01-23 12:00:11 +0100
committerEmilien Macchi <emilien@redhat.com>2017-02-14 21:35:11 -0500
commitb79195de8ef4d822f9ce954e9fe5d1d3ccacc322 (patch)
treee9d34df2b6c28895b82e6b4b30be53ccc5da52c2
parent8ef4566258bc4c272fe7fb89cf325a7b6afea26c (diff)
downloadheat-b79195de8ef4d822f9ce954e9fe5d1d3ccacc322.tar.gz
Add CEPHFS manila share protocol
Allows to use OS::Manila::Share with share_protocol set to CEPHFS. Closes-Bug: #1664574 Change-Id: Ia2ece0163a3c25eb28bc0b471cd1797d52fe4e3c (cherry picked from commit ddb0dff5ab70303480ba28e43eb8292d2f086ef1)
-rw-r--r--heat/engine/resources/openstack/manila/share.py2
-rw-r--r--releasenotes/notes/add-cephfs-share-protocol-033e091e7c6c5166.yaml5
2 files changed, 6 insertions, 1 deletions
diff --git a/heat/engine/resources/openstack/manila/share.py b/heat/engine/resources/openstack/manila/share.py
index 43a69eadc..80d1f2a20 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 000000000..b90541d5d
--- /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.