openstack/tripleo-heat-templates
Code Issues Proposed changes

Permits configuration of Cinder enabled_backend via hieradata

Browse Source 
It is currently possible to provide arbitrary config settings for
Cinder using the "cinder::config::cinder_config:" hiera key. To add
a backend though particular one has to edit the list of enabled
backends in Cinder too which isn't possible. This change will make
it possible using a user-customizable array of backends to be enabled.

Change-Id: Ic664c1c2b0f7b1b4b6be8b5064a38650694d4857
This commit is contained in:
Giulio Fidente 2016-01-19 11:10:49 +01:00
parent ef73827d73
commit dbe67005a5
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

@ -99,6 +99,7 @@ ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler cinder::scheduler::scheduler_driver: cinder.scheduler.filter_scheduler.FilterScheduler
cinder::cron::db_purge::destination: '/dev/null' cinder::cron::db_purge::destination: '/dev/null'
cinder::host: hostgroup cinder::host: hostgroup
cinder_user_enabled_backends: []
# heat # heat
heat::engine::configure_delegated_roles: false 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: DEFAULT/swift_catalog_info:
value: 'object-store:swift:internalURL' value: 'object-store:swift:internalURL'
cinder_user_enabled_backends: []
volume_classes: [] volume_classes: []

2
puppet/manifests/overcloud_controller.pp
View File

@ -505,7 +505,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]) $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' : class { '::cinder::backends' :
enabled_backends => $cinder_enabled_backends, enabled_backends => union($cinder_enabled_backends, hiera('cinder_user_enabled_backends')),
} }
# swift proxy # swift proxy

2
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -885,7 +885,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]) $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' : class { '::cinder::backends' :
enabled_backends => $cinder_enabled_backends, enabled_backends => union($cinder_enabled_backends, hiera('cinder_user_enabled_backends')),
} }
class { '::sahara': 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) $cinder_enabled_backends = any2array($cinder_iscsi_backend)
class { '::cinder::backends' : 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') $snmpd_user = hiera('snmpd_readonly_user_name')