Merge "Permits configuration of Cinder enabled_backend via hieradata"
This commit is contained in:
commit
31c91bed88
@ -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
|
||||
|
@ -9,4 +9,6 @@ cinder::config::cinder_config:
|
||||
DEFAULT/swift_catalog_info:
|
||||
value: 'object-store:swift:internalURL'
|
||||
|
||||
cinder_user_enabled_backends: []
|
||||
|
||||
volume_classes: []
|
@ -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
|
||||
|
@ -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':
|
||||
|
@ -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')
|
||||
|
Loading…
x
Reference in New Issue
Block a user