opendev
/
puppet-openstackid
Code Issues Proposed changes

Default to hostname not fqdn for laravel env 

Laravel expects the short hostname for its environment identifier,
but we didn't notice this before because production openstackid.org
and openstackid-dev.openstack.org had incorrect /etc/hostname files
containing their fully qualified hostnames rather than their short
hostnames. Now that we correctly set the contents of the hostname
file in new deployments, this will break without correcting the
Puppet module.

The plan is to merge this with Puppet disabled for openstackid.org,
confirm that correcting the hostname on openstackid-dev revives it,
then manually apply the same correction and this patch on production
openstackid.org before reenabling Puppet there.

Change-Id: I41ddb3cd12fa564d19cedc18ca5585d2ca7481da
Depends-On: If67783a2cbaf77e89a3d2aae80a9206b547dbac6
This commit is contained in:
Jeremy Stanley 2016-03-23 13:55:50 +00:00
parent afe80004cc
commit d738f5647d
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/init.pp
View File

@ -44,7 +44,7 @@ class openstackid (
$id_log_error_to_email = '',
$id_log_error_from_email = '',
$id_environment = 'dev',
$id_hostname = $::fqdn,
$id_hostname = $::hostname,
$id_recaptcha_public_key = '',
$id_recaptcha_private_key = '',
$id_recaptcha_template = '',