openstack/fuel-library
Code Issues Proposed changes

Merge "Add glance.store.http.Store to glance known_stores"

Browse Source
This commit is contained in:
Jenkins 2014-10-28 09:02:53 +00:00 committed by Gerrit Code Review
commit 97f28a07fe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
View File

@ -244,13 +244,13 @@ class osnailyfacter::cluster_ha {
if ($storage_hash['images_ceph']) {
$glance_backend = 'ceph'
$glance_known_stores = [ 'glance.store.rbd.Store' ]
$glance_known_stores = [ 'glance.store.rbd.Store', 'glance.store.http.Store' ]
} elsif ($storage_hash['images_vcenter']) {
$glance_backend = 'vmware'
$glance_known_stores = [ 'glance.store.vmware_datastore.Store' ]
$glance_known_stores = [ 'glance.store.vmware_datastore.Store', 'glance.store.http.Store' ]
} else {
$glance_backend = 'swift'
$glance_known_stores = [ 'glance.store.swift.Store' ]
$glance_known_stores = [ 'glance.store.swift.Store', 'glance.store.http.Store' ]
}
if ($::use_ceph) {

4
deployment/puppet/osnailyfacter/manifests/cluster_simple.pp
View File

@ -174,10 +174,10 @@ class osnailyfacter::cluster_simple {
if ($storage_hash['images_ceph']) {
$glance_backend = 'ceph'
$glance_known_stores = [ 'glance.store.rbd.Store' ]
$glance_known_stores = [ 'glance.store.rbd.Store', 'glance.store.http.Store' ]
} elsif ($storage_hash['images_vcenter']) {
$glance_backend = 'vmware'
$glance_known_stores = [ 'glance.store.vmware_datastore.Store' ]
$glance_known_stores = [ 'glance.store.vmware_datastore.Store', 'glance.store.http.Store' ]
} else {
$glance_backend = 'file'
$glance_known_stores = false