diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-01 18:36:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-01 18:36:55 +0000 |
| commit | 3db050ec281a937d76d58026a48dfbcecf8ea898 (patch) | |
| tree | 549019c8ff34c43bb545d3cc4b51e479da84d9ff | |
| parent | 354ca0a55326757748c2abb3c6fbbad8aaf4ef96 (diff) | |
| parent | 9a25ce547e5b5e2c630cf874a4898028afdd82e1 (diff) | |
Merge "Fix enabling zaqar keystone endpoint and MySQL database" into stable/pike
| -rw-r--r-- | manifests/profile/base/database/mysql.pp | 2 | ||||
| -rw-r--r-- | manifests/profile/base/keystone.pp | 2 |
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 } |