Fix enabling zaqar keystone endpoint and MySQL database
The zaqar service name switched to zaqar-api[1], so the hieradata key
is zaqar_api_enabled now instead of zaqar_enabled.
[1] I9b451eac4427a52ad8eec62ff89acc6c6d3ab799
Closes-Bug: #1714213
Change-Id: I692658337e7afc9d0a99b245f8b0b4f76a076bc4
(cherry picked from commit bc6a526f91
)
This commit is contained in:
parent
0457aa12e6
commit
9a25ce547e
|
@ -229,7 +229,7 @@ class tripleo::profile::base::database::mysql (
|
|||
if hiera('ec2_api_enabled', false) {
|
||||
include ::ec2api::db::mysql
|
||||
}
|
||||
if hiera('zaqar_enabled', false) and hiera('zaqar::db::mysql::user', '') == 'zaqar' {
|
||||
if hiera('zaqar_api_enabled', false) and hiera('zaqar::db::mysql::user', '') == 'zaqar' {
|
||||
# NOTE: by default zaqar uses mongodb
|
||||
include ::zaqar::db::mysql
|
||||
}
|
||||
|
|
|
@ -337,7 +337,7 @@ class tripleo::profile::base::keystone (
|
|||
if hiera('trove_api_enabled', false) {
|
||||
include ::trove::keystone::auth
|
||||
}
|
||||
if hiera('zaqar_enabled', false) {
|
||||
if hiera('zaqar_api_enabled', false) {
|
||||
include ::zaqar::keystone::auth
|
||||
include ::zaqar::keystone::auth_websocket
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue