Update Packstack to use ::gnocchi::keystone::authtoken
Setting authtoken is now done by ::gnocchi::keystone::authtoken. Resolves a duplicate declaration error on keystone_authtoken/auth_version introduced in https://review.openstack.org/#/c/347417/ Change-Id: I82c7eab0fc56a8b554eebfd22052e984cfe80a86
This commit is contained in:
parent
434269a0e8
commit
6a49be56b2
@ -20,17 +20,16 @@ class packstack::gnocchi ()
|
||||
default => '0.0.0.0',
|
||||
}
|
||||
|
||||
class { '::gnocchi::api':
|
||||
host => $bind_host,
|
||||
keystone_identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
|
||||
keystone_password => hiera('CONFIG_GNOCCHI_KS_PW'),
|
||||
keystone_auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
|
||||
service_name => 'httpd',
|
||||
class { '::gnocchi::keystone::authtoken':
|
||||
auth_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
|
||||
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
|
||||
auth_version => hiera('CONFIG_KEYSTONE_API_VERSION'),
|
||||
password => hiera('CONFIG_GNOCCHI_KS_PW')
|
||||
}
|
||||
|
||||
# TO-DO: Remove this workaround as soon as module support is implemented (see rhbz#1300662)
|
||||
gnocchi_config {
|
||||
'keystone_authtoken/auth_version': value => hiera('CONFIG_KEYSTONE_API_VERSION');
|
||||
class { '::gnocchi::api':
|
||||
host => $bind_host,
|
||||
service_name => 'httpd'
|
||||
}
|
||||
|
||||
class { '::gnocchi::db::sync':
|
||||
|
Loading…
Reference in New Issue
Block a user