summaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-04 16:49:08 +0000
committerGerrit Code Review <review@openstack.org>2015-05-04 16:49:08 +0000
commit4d4a544c26ffca49a47a90d511996d3bdb2c1d06 (patch)
tree14baa003a3980f59c0eafd1e0a03df85628dfa7e /puppet/manifests/overcloud_controller.pp
parent0ef982864d85890acd061cc4fe31eb9b5320ade5 (diff)
parentfd212bdd5ae421beda147d934c3a638c1444143c (diff)
Merge "Add support for Glance RBD backend"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r--puppet/manifests/overcloud_controller.pp14
1 files changed, 12 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 6e8bf5a7..d78f2d07 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -293,11 +293,21 @@ if hiera('step') >= 3 {
require => File['/etc/keystone/ssl/certs'],
}
+ $glance_backend = downcase(hiera('glance_backend', 'swift'))
+ case $glance_backend {
+ swift: { $glance_store = 'glance.store.swift.Store' }
+ file: { $glance_store = 'glance.store.filesystem.Store' }
+ rbd: { $glance_store = 'glance.store.rbd.Store' }
+ default: { fail('Unrecognized glance_backend parameter.') }
+ }
+
# TODO: notifications, scrubber, etc.
include ::glance
- include ::glance::api
+ class { 'glance::api':
+ known_stores => [$glance_store]
+ }
include ::glance::registry
- include ::glance::backend::swift
+ include join(['::glance::backend::', $glance_backend])
class { 'nova':
glance_api_servers => join([hiera('glance_protocol'), '://', hiera('controller_virtual_ip'), ':', hiera('glance_port')]),