aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-10 20:48:16 +0000
committerGerrit Code Review <review@openstack.org>2017-04-10 20:48:16 +0000
commit5d4b65b583a673e948e8527a77afd0cd04879f10 (patch)
tree3ef1211d09aa292f260d91d2109443cbe27e425b /manifests
parentc29080168db2ad544c9ae78ed3879660dc57f85c (diff)
parent38142b7b8f30f530a6af258b58821c58a815d810 (diff)
Merge "Add missing octavia auth include to keystone manifest" into stable/ocata
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/keystone.pp3
1 files changed, 3 insertions, 0 deletions
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index 91ebd4d..bc8b4db 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -257,6 +257,9 @@ class tripleo::profile::base::keystone (
if hiera('nova_placement_enabled', false) {
include ::nova::keystone::auth_placement
}
+ if hiera('octavia_api_enabled', false) {
+ include ::octavia::keystone::auth
+ }
if hiera('panko_api_enabled', false) {
include ::panko::keystone::auth
}