commit 0c1f51bb55a9940a0c0609dae9924967182c3905
author mcp-jenkins <mcp-jenkins@mirantis.com> Tue Jan 29 00:54:46 2019 +0000
committer Gerrit Code Review <mail@domain.com> Tue Jan 29 00:54:46 2019 +0000
tree 2b6daac71f97e0fcd5833fdf7ccf9a4c97faf8e6
parent ad060d8dc81e1dce566d679572c55006b6ec2e04
parent ae7714aedcb52ce752bee6e772e89cbfd4440fc1

Merge "Handle identity.protocol" into release/2019.2.0

octavia/files/pike/octavia_api.conf

diff --git a/octavia/files/pike/octavia_api.conf b/octavia/files/pike/octavia_api.conf
index 8249077..9a70770 100644
--- a/octavia/files/pike/octavia_api.conf
+++ b/octavia/files/pike/octavia_api.conf
@@ -962,7 +962,7 @@
 
 # The auth_url is the admin endpoint actually used for validating tokens
 #auth_url = <None>
-auth_url=http://{{ api.identity.host }}:35357
+auth_url={{ api.identity.get('protocol', 'http') }}://{{ api.identity.host }}:35357
 
 # API version of the admin Identity API endpoint. (string value)
 #auth_version = <None>

octavia/files/pike/octavia_manager.conf

diff --git a/octavia/files/pike/octavia_manager.conf b/octavia/files/pike/octavia_manager.conf
index 9fdc315..60e181c 100644
--- a/octavia/files/pike/octavia_manager.conf
+++ b/octavia/files/pike/octavia_manager.conf
@@ -1009,7 +1009,7 @@
 
 # The auth_url is the admin endpoint actually used for validating tokens
 #auth_url = <None>
-auth_url=http://{{ manager.identity.host }}:35357
+auth_url={{ manager.identity.get('protocol', 'http') }}://{{ manager.identity.host }}:35357
 
 # API version of the admin Identity API endpoint. (string value)
 #auth_version = <None>