aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-06 19:09:05 +0000
committerGerrit Code Review <review@openstack.org>2015-07-06 19:09:05 +0000
commitbca9e7fa9f18a436b0840f17454516c8a10f36fd (patch)
tree3db3d6dd995a7b19ed790b0c06108c7f9c78ded0 /puppet/manifests
parent21c8f0489616b9c158493ced842a12f8452fb36f (diff)
parentb4d541eb483ae892cb81d813bb522982822557dc (diff)
Merge "controller: enable HTTP Glance backend"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp10
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp10
2 files changed, 12 insertions, 8 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index bc20bad5..896545c3 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -237,16 +237,18 @@ if hiera('step') >= 3 {
$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' }
+ swift: { $backend_store = 'glance.store.swift.Store' }
+ file: { $backend_store = 'glance.store.filesystem.Store' }
+ rbd: { $backend_store = 'glance.store.rbd.Store' }
default: { fail('Unrecognized glance_backend parameter.') }
}
+ $http_store = ['glance.store.http.Store']
+ $glance_store = concat($http_store, $backend_store)
# TODO: notifications, scrubber, etc.
include ::glance
class { 'glance::api':
- known_stores => [$glance_store]
+ known_stores => $glance_store
}
include ::glance::registry
include join(['::glance::backend::', $glance_backend])
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index feabf6a0..3b5b8fe4 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -543,16 +543,18 @@ if hiera('step') >= 3 {
$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' }
+ swift: { $backend_store = 'glance.store.swift.Store' }
+ file: { $backend_store = 'glance.store.filesystem.Store' }
+ rbd: { $backend_store = 'glance.store.rbd.Store' }
default: { fail('Unrecognized glance_backend parameter.') }
}
+ $http_store = ['glance.store.http.Store']
+ $glance_store = concat($http_store, $backend_store)
# TODO: notifications, scrubber, etc.
include ::glance
class { 'glance::api':
- known_stores => [$glance_store],
+ known_stores => $glance_store,
manage_service => false,
enabled => false,
}