diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-08 05:15:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-08 05:15:21 +0000 |
| commit | 6ae90da66d6125be58651e680f1fb603134087fe (patch) | |
| tree | 1e24d0b6bcfb27b319a8210a7f77c543092ea642 /environments | |
| parent | 07ac3d18fdc50714c1627a828657ddb383d9f23b (diff) | |
| parent | 94c624c30ca68328e3331717d2961dc969dcddd0 (diff) | |
Merge "Enable Cinder as a backend for Glance" into stable/pike
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/storage/enable-ceph.yaml | 2 | ||||
| -rw-r--r-- | environments/storage/external-ceph.yaml | 2 | ||||
| -rw-r--r-- | environments/storage/glance-nfs.yaml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/environments/storage/enable-ceph.yaml b/environments/storage/enable-ceph.yaml index 596ec16e..c43f2fa1 100644 --- a/environments/storage/enable-ceph.yaml +++ b/environments/storage/enable-ceph.yaml @@ -21,7 +21,7 @@ parameter_defaults: # Type: boolean CinderEnableRbdBackend: True - # The short name of the Glance backend to use. Should be one of swift, rbd, or file + # The short name of the Glance backend to use. Should be one of swift, rbd, cinder, or file # Type: string GlanceBackend: rbd diff --git a/environments/storage/external-ceph.yaml b/environments/storage/external-ceph.yaml index 0f2d0396..dde2c907 100644 --- a/environments/storage/external-ceph.yaml +++ b/environments/storage/external-ceph.yaml @@ -43,7 +43,7 @@ parameter_defaults: # Type: string CinderRbdPoolName: volumes - # The short name of the Glance backend to use. Should be one of swift, rbd, or file + # The short name of the Glance backend to use. Should be one of swift, rbd, cinder, or file # Type: string GlanceBackend: rbd diff --git a/environments/storage/glance-nfs.yaml b/environments/storage/glance-nfs.yaml index 3c139306..359401d5 100644 --- a/environments/storage/glance-nfs.yaml +++ b/environments/storage/glance-nfs.yaml @@ -21,7 +21,7 @@ parameter_defaults: # Static parameters - these are values that must be # included in the environment but should not be changed. # ****************************************************** - # The short name of the Glance backend to use. Should be one of swift, rbd, or file + # The short name of the Glance backend to use. Should be one of swift, rbd, cinder, or file # Type: string GlanceBackend: file |