openstack
/
puppet-tripleo
Code Issues Proposed changes

Partially revert "Fail more gracefully when passed an empty ip" 

This reverts the manifests/haproxy.pp parts of
commit 4c7ca4cbc3.

The reverted commit made it such that you can not set a
hostname as undercloud_public_host in undercloud.conf. This
is required so that the UI can be accessed by hostname
externally as well as to make the Undercloud API accessible
externally. We keep the parts of that change that verify if
the haproxy VIP for pacemaker is a proper IP as it can
happen that a misconfigured network template causes empty
strings and the deploy will fail in a very odd way.

Change-Id: I57eeb2dd26336465627593d633c63b92da42e71d
Closes-Bug: #1763776
This commit is contained in:
Michele Baldessari 2018-04-15 19:49:49 +02:00
parent 2131880c71
commit 6d51054796
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/haproxy.pp
View File

@ -765,13 +765,6 @@ class tripleo::haproxy (
}
$ports = merge($default_service_ports, $service_ports)
if !is_ip_addresses($controller_virtual_ip) {
fail("controller_virtual_ip param: ${controller_virtual_ip}, is not a proper IP address.")
}
if !is_ip_addresses($public_virtual_ip) {
fail("public_virtual_ip: ${public_virtual_ip}, is not a proper IP address.")
}
if $enable_internal_tls {
$base_internal_tls_member_options = ['ssl', 'verify required', "ca-file ${ca_bundle}"]