Use swift backend for glance in scenario002 jobs

This commit adds ability to use swift as glance backend for our
scenario002 integration jobs.

Depends-On: I232536d179db92d82f1c7459a0f13e5ca5576f42

Change-Id: Ie187ffb0e80a623ca2837b0bd0c0502e9d7dc9dd
This commit is contained in:
Denis Egorenko 2016-02-25 18:34:15 +03:00
parent f828b13957
commit 918a6c9342
3 changed files with 14 additions and 3 deletions

View File

@ -34,7 +34,7 @@ scenario](#All-In-One).
| - | scenario001 | scenario002 | scenario003 | scenario-aio |
|:----------:|:-----------:|:-----------:|:-----------:|:-------------:
| keystone | X | X | X | X |
| glance | rbd | file | file | file |
| glance | rbd | swift | file | file |
| nova | rbd | X | X | X |
| neutron | X | X | X | X |
| cinder | rbd | iscsi | | iscsi |

View File

@ -18,7 +18,9 @@ include ::openstack_integration
include ::openstack_integration::rabbitmq
include ::openstack_integration::mysql
include ::openstack_integration::keystone
include ::openstack_integration::glance
class { '::openstack_integration::glance':
backend => 'swift',
}
include ::openstack_integration::neutron
include ::openstack_integration::nova
include ::openstack_integration::cinder

View File

@ -2,7 +2,7 @@
#
# [*backend*]
# (optional) Glance backend to use.
# Can be 'file' or 'rbd'.
# Can be 'file', 'swift' or 'rbd'.
# Defaults to 'file'.
#
class openstack_integration::glance (
@ -45,6 +45,15 @@ class openstack_integration::glance (
# make sure ceph pool exists before running Glance API
Exec['create-glance'] -> Service['glance-api']
}
'swift': {
Service<| tag == 'swift-service' |> -> Service['glance-api']
$backend_store = ['swift']
class { '::glance::backend::swift':
swift_store_user => 'services:glance',
swift_store_key => 'a_big_secret',
swift_store_create_container_on_put => 'True',
}
}
default: {
fail("Unsupported backend (${backend})")
}