summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-08-31 12:45:14 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-09-01 05:06:23 +0000
commit9a25ce547e5b5e2c630cf874a4898028afdd82e1 (patch)
tree6b52bae3d41c233a695c31c10d1a4a8a4870da9a /manifests
parent0457aa12e65e3d1fa6125da6e609fbd547d1b9d7 (diff)
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 bc6a526f91c156e1cecfb9226ae3686102e655d4)
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/database/mysql.pp2
-rw-r--r--manifests/profile/base/keystone.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 7bb8c74..bdfd96c 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -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
}
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 47b5276..6ce655e 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -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
}