diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/hieradata/controller.yaml | 4 | ||||
| -rw-r--r-- | puppet/overcloud_controller.pp | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 99783a54..b13f8234 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -38,8 +38,12 @@ 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 # neutron neutron::core_plugin: 'ml2' diff --git a/puppet/overcloud_controller.pp b/puppet/overcloud_controller.pp index b766dc50..20413cc6 100644 --- a/puppet/overcloud_controller.pp +++ b/puppet/overcloud_controller.pp @@ -158,9 +158,12 @@ if hiera('step') >= 2 { require => File['/etc/keystone/ssl/certs'], } - # TODO: swift backend, also notifications, scrubber, etc. + # TODO: notifications, scrubber, etc. include ::glance::api include ::glance::registry + class { 'glance::backend::swift': + swift_store_auth_address => join(['http://', hiera('controller_virtual_ip'), ':5000/v2.0']), + } class { 'nova': rabbit_hosts => [hiera('controller_virtual_ip')], |