openstack/puppet-horizon
Code Issues Proposed changes

Merge "add parameter to set the cert to verify openstack SSL connections"

Browse Source
This commit is contained in:
Zuul 2018-07-13 02:29:56 +00:00 committed by Gerrit Code Review
commit f9c05f26d7
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/init.pp
View File

@ -190,6 +190,10 @@
# properly configured DNS which will resolve hostnames for SSL endpoints # properly configured DNS which will resolve hostnames for SSL endpoints
# Horizon will connect to. (Defaults to false) # Horizon will connect to. (Defaults to false)
# #
# [*openstack_ssl_cacert*]
# (optional) The CA certificate to use to verify SSL
# openstack connection.
#
# [*ssl_redirect*] # [*ssl_redirect*]
# (optional) Whether to redirect http to https # (optional) Whether to redirect http to https
# Defaults to True # Defaults to True
@ -468,6 +472,7 @@ class horizon(
$http_port = 80, $http_port = 80,
$https_port = 443, $https_port = 443,
$ssl_no_verify = false, $ssl_no_verify = false,
$openstack_ssl_cacert = '',
$ssl_redirect = true, $ssl_redirect = true,
$horizon_cert = undef, $horizon_cert = undef,
$horizon_key = undef, $horizon_key = undef,

4
templates/local_settings.py.erb
View File

@ -340,7 +340,11 @@ OPENSTACK_SSL_NO_VERIFY = True
<% end -%> <% end -%>
# The CA certificate to use to verify SSL connections # The CA certificate to use to verify SSL connections
<% if @openstack_ssl_cacert == '' -%>
#OPENSTACK_SSL_CACERT = '/path/to/cacert.pem' #OPENSTACK_SSL_CACERT = '/path/to/cacert.pem'
<% else -%>
OPENSTACK_SSL_CACERT = '<%= @openstack_ssl_cacert %>'
<% end -%>
# The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the # The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the
# capabilities of the auth backend for Keystone. # capabilities of the auth backend for Keystone.