x/packstack
Code Issues Proposed changes

Merge "Properly handle Cinder backends"

Browse Source
This commit is contained in:
Jenkins 2016-09-21 01:11:14 +00:00 committed by Gerrit Code Review
commit 0ac25ddf50
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packstack/puppet/modules/packstack/manifests/cinder.pp
View File

@ -3,7 +3,9 @@ class packstack::cinder ()
create_resources(packstack::firewall, hiera('FIREWALL_CINDER_RULES', {}))
create_resources(packstack::firewall, hiera('FIREWALL_CINDER_API_RULES', {}))
case hiera('CONFIG_CINDER_BACKEND') {
$cinder_backends = hiera_array('CONFIG_CINDER_BACKEND')
case $cinder_backends[0] {
'lvm': { $default_volume_type = 'iscsi' }
'gluster': { $default_volume_type = 'glusterfs' }
'nfs': { $default_volume_type = 'nfs' }

4
packstack/puppet/templates/controller.pp
View File

@ -47,7 +47,9 @@ if hiera('CONFIG_CINDER_INSTALL') == 'y' {
include '::packstack::cinder::backup'
}
case hiera('CONFIG_CINDER_BACKEND') {
$cinder_backends = hiera_array('CONFIG_CINDER_BACKEND')
case $cinder_backends[0] {
'lvm': { include '::packstack::cinder::backend::lvm' }
'gluster': { include '::packstack::cinder::backend::gluster' }
'nfs': { include '::packstack::cinder::backend::nfs' }