Browse Source

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

changes/76/826476/1
Zuul 4 months ago committed by Gerrit Code Review
parent
commit
c9dd1d6af4
  1. 6
      packstack/puppet/modules/packstack/manifests/glance.pp
  2. 3
      packstack/puppet/modules/packstack/manifests/glance/backend/file.pp
  3. 2
      packstack/puppet/modules/packstack/manifests/glance/backend/swift.pp

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

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

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

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

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

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

Loading…
Cancel
Save