Revert "glance: disable swift backend"

This reverts commit b8c5ac7367.
Now that the swift problem is fixed we can re-enable it.

Related-Bug: 1595916
Closes-Bug: 1610935
Change-Id: I3fe9eb54b4efec99b4e58a67b4ff2d531011ee90
This commit is contained in:
Derek Higgins 2016-07-01 17:25:25 +01:00 committed by Giulio Fidente
parent 95e87eb04d
commit b4fa8fb2b6
2 changed files with 4 additions and 5 deletions

View File

@ -259,7 +259,7 @@ class { '::glance::api':
enable_proxy_headers_parsing => $enable_proxy_headers_parsing,
}
include ::glance::registry
include ::glance::backend::file
include ::glance::backend::swift
include ::glance::notify::rabbitmq
class { '::nova':

View File

@ -87,10 +87,9 @@ glance::api::identity_uri: "%{hiera('keystone_identity_uri')}"
glance::api::registry_host: {{LOCAL_IP}}
glance::api::keystone_password: {{UNDERCLOUD_GLANCE_PASSWORD}}
glance::api::stores:
- file
# For now, we can't enable Swift backend because of OOM issue.
# See https://bugs.launchpad.net/tripleo/+bug/1595916
glance::api::default_store: 'file'
- glance.store.filesystem.Store
- glance.store.swift.Store
glance::api::default_store: 'glance.store.swift.Store'
glance::api::pipeline: 'keystone'
# used to construct glance_api_servers
glance_port: 9292