openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Permits configuration of Cinder enabled_backend via hieradata"

This commit is contained in:
Jenkins 2016-03-08 15:34:49 +00:00 committed by Gerrit Code Review
parent 42fef7257d dbe67005a5
commit 31c91bed88
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/hieradata/controller.yaml
View File

@ -100,6 +100,7 @@ ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
cinder::cron::db_purge::destination: '/dev/null'
cinder::host: hostgroup
cinder_user_enabled_backends: []
# heat
heat::engine::configure_delegated_roles: false

2
puppet/hieradata/volume.yaml
View File

@ -9,4 +9,6 @@ cinder::config::cinder_config:
DEFAULT/swift_catalog_info:
value: 'object-store:swift:internalURL'
cinder_user_enabled_backends: []
volume_classes: []

2
puppet/manifests/overcloud_controller.pp
View File

@ -509,7 +509,7 @@ if hiera('step') >= 3 {
$cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_eqlx_backend, $cinder_dellsc_backend, $cinder_netapp_backend, $cinder_nfs_backend])
class { '::cinder::backends' :
enabled_backends => $cinder_enabled_backends,
enabled_backends => union($cinder_enabled_backends, hiera('cinder_user_enabled_backends')),
}
# swift proxy

2
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -950,7 +950,7 @@ if hiera('step') >= 3 {
$cinder_enabled_backends = delete_undef_values([$cinder_iscsi_backend, $cinder_rbd_backend, $cinder_eqlx_backend, $cinder_dellsc_backend, $cinder_netapp_backend, $cinder_nfs_backend])
class { '::cinder::backends' :
enabled_backends => $cinder_enabled_backends,
enabled_backends => union($cinder_enabled_backends, hiera('cinder_user_enabled_backends')),
}
class { '::sahara':

2
puppet/manifests/overcloud_volume.pp
View File

@ -44,7 +44,7 @@ if $cinder_enable_iscsi {
$cinder_enabled_backends = any2array($cinder_iscsi_backend)
class { '::cinder::backends' :
enabled_backends => $cinder_enabled_backends,
enabled_backends => union($cinder_enabled_backends, hiera('cinder_user_enabled_backends')),
}
$snmpd_user = hiera('snmpd_readonly_user_name')