summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-08 05:15:21 +0000
committerGerrit Code Review <review@openstack.org>2017-11-08 05:15:21 +0000
commit6ae90da66d6125be58651e680f1fb603134087fe (patch)
tree1e24d0b6bcfb27b319a8210a7f77c543092ea642 /puppet/services
parent07ac3d18fdc50714c1627a828657ddb383d9f23b (diff)
parent94c624c30ca68328e3331717d2961dc969dcddd0 (diff)
Merge "Enable Cinder as a backend for Glance" into stable/pike
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/glance-api.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index 8ec3546f..1baf120b 100644
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -78,10 +78,10 @@ parameters:
GlanceBackend:
default: swift
description: The short name of the Glance backend to use. Should be one
- of swift, rbd, or file
+ of swift, rbd, cinder, or file
type: string
constraints:
- - allowed_values: ['swift', 'file', 'rbd']
+ - allowed_values: ['swift', 'file', 'rbd', 'cinder']
GlanceNfsEnabled:
default: false
description: >