openstack
/
puppet-tripleo
Code Issues Proposed changes

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
This commit is contained in:
Juan Antonio Osorio Robles 2017-08-31 12:45:14 +03:00
parent 11cec1c6f1
commit bc6a526f91
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/database/mysql.pp
View File

@ -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
}

2
manifests/profile/base/keystone.pp
View File

@ -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
}