From 7ab4bd40f844f65ce86521cb1ed51c3715cab603 Mon Sep 17 00:00:00 2001
From: Brent Eagles <beagles@redhat.com>
Date: Tue, 12 Dec 2017 15:41:43 -0330
Subject: [PATCH] Add auth_type to service_auth configuration

This patch sets the auth_type to 'password' as is required by Octavia.
It also changes the auth_url endpoint to contain the suffix.

Depends-On: I712db2e7310ba32cb68a7266c6b563ab3f4ab8cf
Change-Id: I19b3d457301aa28efeff26d5513c89cbbb24d521
---
 puppet/services/octavia-base.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/puppet/services/octavia-base.yaml b/puppet/services/octavia-base.yaml
index 19c17aae9f..918cce25a0 100644
--- a/puppet/services/octavia-base.yaml
+++ b/puppet/services/octavia-base.yaml
@@ -123,13 +123,14 @@ outputs:
              octavia::rabbit_userid: {get_param: RabbitUserName}
              octavia::rabbit_password: {get_param: RabbitPassword}
              octavia::rabbit_port: {get_param: RabbitClientPort}
-             octavia::service_auth::auth_url: {get_param: [EndpointMap, KeystonePublic, uri_no_suffix]}
+             octavia::service_auth::auth_url: {get_param: [EndpointMap, KeystonePublic, uri]}
              octavia::service_auth::auth_type: 'password'
              octavia::service_auth::username: 'octavia'
              octavia::service_auth::password: {get_param: OctaviaPassword}
              octavia::service_auth::project_name: 'service'
              octavia::service_auth::project_domain_name: 'Default'
              octavia::service_auth::user_domain_name: 'Default'
+             octavia::service_auth::auth_type: 'password'
              octavia::certificates::ca_certificate: {get_param: OctaviaCaCertFile}
              octavia::certificates::ca_private_key: {get_param: OctaviaCaKeyFile}
              octavia::certificates::ca_private_key_passphrase: {get_param: OctaviaCaKeyPassphrase}