diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-08 15:34:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-08 15:34:50 +0000 |
| commit | 31c91bed886f76e107a78021977e4c9bd338c76a (patch) | |
| tree | 8bc88614c932deab155b834e6187c733f2994304 /puppet/hieradata | |
| parent | 42fef7257ddceaca42086d8f6b75a19e61cbf68d (diff) | |
| parent | dbe67005a59f90a1ffe8e2d8b550ec5d6ca27a7e (diff) | |
Merge "Permits configuration of Cinder enabled_backend via hieradata"
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/controller.yaml | 1 | ||||
| -rw-r--r-- | puppet/hieradata/volume.yaml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index f97bda11..e80bee07 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -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 diff --git a/puppet/hieradata/volume.yaml b/puppet/hieradata/volume.yaml index f4cd78a9..8640c0a7 100644 --- a/puppet/hieradata/volume.yaml +++ b/puppet/hieradata/volume.yaml @@ -9,4 +9,6 @@ cinder::config::cinder_config: DEFAULT/swift_catalog_info: value: 'object-store:swift:internalURL' +cinder_user_enabled_backends: [] + volume_classes: []
\ No newline at end of file |