summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-07 14:44:50 +0000
committerGerrit Code Review <review@openstack.org>2017-04-07 14:44:50 +0000
commitd8273a48609bb0babab225b5d0e7b63e246b999e (patch)
tree80c2e4533d333d1c2d1ddffcfb84792494f53b81 /manifests/profile/base
parenta9b9392c45f6b45e8f4d2db77d2fd98642178bf8 (diff)
parent23e723255cf46fd730cae185a0dc1f7194a511e0 (diff)
Merge "Add missing octavia auth include to keystone manifest"
Diffstat (limited to 'manifests/profile/base')
-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 5909337..134e751 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -310,6 +310,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
}