From fd212bdd5ae421beda147d934c3a638c1444143c Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Thu, 9 Apr 2015 08:41:24 -0400 Subject: Add support for Glance RBD backend This patch adds support for a new GlanceBackend setting which can be set to one of swift, rbd, or file to control which Glance backend is configured for use by default. Change-Id: Id6a3fbc3477e85e8e2446e3dc13d424f9535d0ff --- puppet/hieradata/ceph.yaml | 1 + puppet/hieradata/controller.yaml | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'puppet/hieradata') diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml index e43b0da5..33ce5efe 100644 --- a/puppet/hieradata/ceph.yaml +++ b/puppet/hieradata/ceph.yaml @@ -9,3 +9,4 @@ ceph::profile::params::authentication_type: cephx ceph_pools: - volumes - vms + - images diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 5cf9f350..0256cbc9 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -48,12 +48,10 @@ swift::proxy::account_autocreate: true # glance glance::api::pipeline: 'keystone' -glance::api::known_stores: - - glance.store.filesystem.Store - - glance.store.swift.Store glance::registry::pipeline: 'keystone' glance::registry::manage_service: true glance::backend::swift::swift_store_create_container_on_put: true +glance::backend::rbd::rbd_store_user: 'openstack' # neutron neutron::core_plugin: 'ml2' -- cgit 1.2.3-korg