Merge "Add cacert_file" into release/2019.2.0
diff --git a/octavia/files/ocata/octavia_api.conf b/octavia/files/ocata/octavia_api.conf
index 38bed3c..55d9dd4 100644
--- a/octavia/files/ocata/octavia_api.conf
+++ b/octavia/files/ocata/octavia_api.conf
@@ -943,7 +943,7 @@
# because normal end users may not be able to reach that endpoint. (string
# value)
#auth_uri = <None>
-auth_uri=http://{{ api.identity.host }}:5000
+auth_uri={{ api.identity.get('protocol', 'http') }}://{{ api.identity.host }}:5000
# API version of the admin Identity API endpoint. (string value)
#auth_version = <None>
@@ -1966,7 +1966,7 @@
# Authentication URL (string value)
#auth_url = <None>
-auth_url=http://{{ api.identity.host }}:35357
+auth_url={{ api.identity.get('protocol', 'http') }}://{{ api.identity.host }}:35357
# Authentication type to load (string value)
# Deprecated group/name - [service_auth]/auth_plugin
diff --git a/octavia/files/ocata/octavia_manager.conf b/octavia/files/ocata/octavia_manager.conf
index a226cd6..4a30eac 100644
--- a/octavia/files/ocata/octavia_manager.conf
+++ b/octavia/files/ocata/octavia_manager.conf
@@ -976,7 +976,7 @@
# because normal end users may not be able to reach that endpoint. (string
# value)
#auth_uri = <None>
-auth_uri=http://{{ manager.identity.host }}:5000
+auth_uri={{ manager.identity.get('protocol', 'http') }}://{{ manager.identity.host }}:5000
# API version of the admin Identity API endpoint. (string value)
#auth_version = <None>
@@ -1999,7 +1999,7 @@
# Authentication URL (string value)
#auth_url = <None>
-auth_url=http://{{ manager.identity.host }}:35357
+auth_url={{ manager.identity.get('protocol', 'http') }}://{{ manager.identity.host }}:35357
# Authentication type to load (string value)
# Deprecated group/name - [service_auth]/auth_plugin
diff --git a/octavia/files/pike/octavia_api.conf b/octavia/files/pike/octavia_api.conf
index 934d6d8..9a70770 100644
--- a/octavia/files/pike/octavia_api.conf
+++ b/octavia/files/pike/octavia_api.conf
@@ -958,11 +958,11 @@
# value)
# The auth_uri is the public endpoint and is returned in headers on a 401
#auth_uri = <None>
-auth_uri=http://{{ api.identity.host }}:5000
+auth_uri={{ api.identity.get('protocol', 'http') }}://{{ api.identity.host }}:5000
# 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>
@@ -1990,7 +1990,7 @@
# Authentication URL (string value)
#auth_url = <None>
-auth_url=http://{{ api.identity.host }}:35357
+auth_url={{ api.identity.get('protocol', 'http') }}://{{ api.identity.host }}:35357
# Authentication type to load (string value)
# Deprecated group/name - [service_auth]/auth_plugin
diff --git a/octavia/files/pike/octavia_manager.conf b/octavia/files/pike/octavia_manager.conf
index 2b39c6c..60e181c 100644
--- a/octavia/files/pike/octavia_manager.conf
+++ b/octavia/files/pike/octavia_manager.conf
@@ -1005,11 +1005,11 @@
# because normal end users may not be able to reach that endpoint. (string
# value)
#auth_uri = <None>
-auth_uri=http://{{ manager.identity.host }}:5000
+auth_uri={{ manager.identity.get('protocol', 'http') }}://{{ manager.identity.host }}:5000
# 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>
@@ -2037,7 +2037,7 @@
# Authentication URL (string value)
#auth_url = <None>
-auth_url=http://{{ manager.identity.host }}:35357
+auth_url={{ manager.identity.get('protocol', 'http') }}://{{ manager.identity.host }}:35357
# Authentication type to load (string value)
# Deprecated group/name - [service_auth]/auth_plugin
diff --git a/octavia/files/queens/octavia_api.conf b/octavia/files/queens/octavia_api.conf
index c35c7bc..d6ba089 100644
--- a/octavia/files/queens/octavia_api.conf
+++ b/octavia/files/queens/octavia_api.conf
@@ -805,7 +805,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
{%- set _data = api.identity %}
{%- if 'cacert_file' not in _data.keys() %}{% do _data.update({'cacert_file': api.cacert_file}) %}{% endif %}
@@ -1000,7 +1000,7 @@
# Authentication URL (string value)
#auth_url = <None>
-auth_url=http://{{ api.identity.host }}:35357
+auth_url={{ api.identity.get('protocol', 'http') }}://{{ api.identity.host }}:35357
# Authentication type to load (string value)
# Deprecated group/name - [service_auth]/auth_plugin
diff --git a/octavia/files/queens/octavia_manager.conf b/octavia/files/queens/octavia_manager.conf
index c080bc6..21b446e 100644
--- a/octavia/files/queens/octavia_manager.conf
+++ b/octavia/files/queens/octavia_manager.conf
@@ -847,11 +847,11 @@
# value)
# The www_authenticate_uri is the public endpoint and is returned in headers on a 401
# auth_uri = https://localhost:5000/v3 # www_authenticate_uri
-auth_uri=http://{{ manager.identity.host }}:5000/v3
+auth_uri={{ manager.identity.get('protocol', 'http') }}://{{ manager.identity.host }}:5000/v3
# 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
{%- set _data = manager.identity %}
{%- if 'cacert_file' not in _data.keys() %}{% do _data.update({'cacert_file': manager.cacert_file}) %}{% endif %}
@@ -1046,7 +1046,7 @@
# Authentication URL (string value)
#auth_url = <None>
-auth_url=http://{{ manager.identity.host }}:35357
+auth_url={{ manager.identity.get('protocol', 'http') }}://{{ manager.identity.host }}:35357
# Authentication type to load (string value)
# Deprecated group/name - [service_auth]/auth_plugin