x/packstack
Code Issues Proposed changes

Merge "Glance: Use multistore resources to set up backend"

Browse Source
This commit is contained in:
Zuul
2022-01-12 16:18:05 +00:00
committed by Gerrit Code Review
parent 2121c472b8 25af876371
commit c9dd1d6af4
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packstack/puppet/modules/packstack/manifests/glance.pp
View File

@@ -33,7 +33,9 @@ class packstack::glance ()
pipeline => 'keystone', pipeline => 'keystone',
database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance", database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
workers => hiera('CONFIG_SERVICE_WORKERS'), workers => hiera('CONFIG_SERVICE_WORKERS'),
stores => ['file', 'http', 'swift'], enabled_backends => ["${default_store}:${default_store}", "http:http"],
default_store => $default_store, default_backend => $default_store,
} }
glance::backend::multistore::http { 'http': }
} }

3
packstack/puppet/modules/packstack/manifests/glance/backend/file.pp
View File

@@ -1,7 +1,6 @@
class packstack::glance::backend::file () class packstack::glance::backend::file ()
{ {
# TO-DO: Make this configurable glance::backend::multistore::file { 'file':
class { 'glance::backend::file':
filesystem_store_datadir => '/var/lib/glance/images/', filesystem_store_datadir => '/var/lib/glance/images/',
} }
} }

2
packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp
View File

@@ -7,7 +7,7 @@ class packstack::glance::backend::swift ()
default => '3', default => '3',
} }
class { 'glance::backend::swift': glance::backend::multistore::swift { 'swift':
swift_store_user => 'services:glance', swift_store_user => 'services:glance',
swift_store_key => hiera('CONFIG_GLANCE_KS_PW'), swift_store_key => hiera('CONFIG_GLANCE_KS_PW'),
swift_store_auth_address => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), swift_store_auth_address => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),