From: Dan Prince Date: Fri, 9 Jan 2015 19:01:31 +0000 (-0500) Subject: Puppet: Switch glance to use a swift backend X-Git-Tag: opnfv-6.0.0~2684 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e6a88fcc66e1f19a50caa81b3171e74f03756f2e;p=apex-tripleo-heat-templates.git Puppet: Switch glance to use a swift backend Now that we have swift we can switch glance over to make use of it. Change-Id: I9513cb63079235337b684aa734af73a0f0cc0afd --- diff --git a/controller-puppet.yaml b/controller-puppet.yaml index efb10fdd..de1d9dcd 100644 --- a/controller-puppet.yaml +++ b/controller-puppet.yaml @@ -605,6 +605,8 @@ resources: glance::registry::database_connection: {get_input: glance_dsn} glance::registry::bind_host: {get_input: controller_host} glance::registry::auth_host: {get_input: controller_virtual_ip} + glance::backend::swift::swift_store_user: service:glance + glance::backend::swift::swift_store_key: {get_input: glance_password} # Heat heat_password: {get_input: heat_password} heat_stack_domain_admin_password: {get_input: heat_stack_domain_admin_password} 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')],