diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-04 16:49:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-04 16:49:08 +0000 |
| commit | 4d4a544c26ffca49a47a90d511996d3bdb2c1d06 (patch) | |
| tree | 14baa003a3980f59c0eafd1e0a03df85628dfa7e /puppet/hieradata | |
| parent | 0ef982864d85890acd061cc4fe31eb9b5320ade5 (diff) | |
| parent | fd212bdd5ae421beda147d934c3a638c1444143c (diff) | |
Merge "Add support for Glance RBD backend"
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/ceph.yaml | 1 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 4 |
2 files changed, 2 insertions, 3 deletions
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' |