openstack
/
puppet-keystone
Code Issues Proposed changes

Accept null value for servername_admin in apache resource 

The servername_admin parameter uses the servername itself to get a
default value. This parameter, is based on the fqdn fact, which can
be null. However, servername_admin is set with the pick function
which doesn't take null values, so it crashes when that's the case.
This takes pick_default into use which actually takes null values and
fixes the issue.

Change-Id: Id8f3e4467b7081802cd2e92414679c49953fcd02
Closes-Bug: #1625010
This commit is contained in:
Juan Antonio Osorio Robles 2016-09-19 09:46:05 +03:00
parent 3ceb12fd98
commit c55a4618bd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/wsgi/apache.pp
View File

@ -207,7 +207,7 @@ class keystone::wsgi::apache (
include ::apache
include ::apache::mod::wsgi
$servername_admin_real = pick($servername_admin, $servername)
$servername_admin_real = pick_default($servername_admin, $servername)
if $ssl {
include ::apache::mod::ssl