From: Brent Eagles <beagles@redhat.com>
Date: Tue, 4 Apr 2017 07:26:20 +0000 (-0230)
Subject: Add missing octavia auth include to keystone manifest
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=38142b7b8f30f530a6af258b58821c58a815d810;p=apex-puppet-tripleo.git

Add missing octavia auth include to keystone manifest

This patch adds the appropriate include to make sure that appropriate
keystone user, services, etc. are created when octavia is selected.

Closes-bug: #1680588

Change-Id: I0b6d657a0300538292223923d8808c23f936c193
(cherry picked from commit 23e723255cf46fd730cae185a0dc1f7194a511e0)
---

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
     }
diff --git a/releasenotes/notes/add-octavia-auth-to-keystone-d0353544c0e27b57.yaml b/releasenotes/notes/add-octavia-auth-to-keystone-d0353544c0e27b57.yaml
new file mode 100644
index 0000000..f2836d5
--- /dev/null
+++ b/releasenotes/notes/add-octavia-auth-to-keystone-d0353544c0e27b57.yaml
@@ -0,0 +1,3 @@
+---
+fixes:
+  - Octavia is now properly registered with keystone when deployed.