Make bind parameter processing more flexible
#154
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes <https://tickets.puppetlabs.com/browse/MODULES-1741>. HAProxy's `bind` parameter for listen and frontend services accepts multiple ways of specifying addresses, ports, port ranges, sockets and bind options. The template `templates/fragments/_bind.erb` that processes the `haproxy::listen::bind` and `haproxy::frontend::bind` hash should accomodate that, meaning specifically that it should not assume that a valid bind configuration is universally of the format `bind <ip address>:<port> [<options>*]`. The HAProxy documentation at http://cbonte.github.io/haproxy-dconv/configuration-1.5.html#4.2-bind details how complex the `bind` configuration can be. The `templates/fragments/_bind.erb` template now processes the `bind` hash very simply by using the hash keys as "address and/or port" and the key's value as a list of bind options that together make up a single `bind` line in the resulting listen or frontend service configuration. Most notably there is no more IP address or port validation. The values are taken as is from the `bind` hash. The rationale behind that is discussed in <https://tickets.puppetlabs.com/browse/MODULES-1741>. Contains updated and expanded documentation, and updated spec tests.
antaflos
force-pushed
the
bind_parameter_flexibility
branch
from
ef7e96a
to
1041fba
Compare
|
now i finally understand the title of your jira. |
|
Granted, I created the Jira issue at 5 AM but I didn't think the title was going to be a problem :) Do you have a suggestion for a better title? |
|
no worries, it's alright! |
|
Would be nice if we could this get merged :-) |
|
ping @cmurphy / @mhaskel: ping, given that @antaflos and me use this in our prod infra, maye we could merge it :) also, now that concat has a |
cmurphy
added a commit
that referenced
this pull request
Feb 16, 2015
Make `bind` parameter processing more flexible
This was referenced Mar 5, 2015
cegeka-jenkins
pushed a commit
to cegeka/puppet-haproxy
that referenced
this pull request
Dec 19, 2017
…ility Make `bind` parameter processing more flexible
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes https://tickets.puppetlabs.com/browse/MODULES-1741.
HAProxy's
bindparameter for listen and frontend services acceptsmultiple ways of specifying addresses, ports, port ranges, sockets and
bind options. The template
templates/fragments/_bind.erbthatprocesses the
haproxy::listen::bindandhaproxy::frontend::bindhashshould accomodate that, meaning specifically that it should not assume
that a valid bind configuration is universally of the format
bind <ip address>:<port> [<options>*]. The HAProxy documentation athttp://cbonte.github.io/haproxy-dconv/configuration-1.5.html#4.2-bind
details how complex the
bindconfiguration can be.The
templates/fragments/_bind.erbtemplate now processes thebindhash very simply by using the hash keys as "address and/or port" and the
key's value as a list of bind options that together make up a single
bindline in the resulting listen or frontend service configuration.Most notably there is no more IP address or port validation. The values
are taken as is from the
bindhash. The rationale behind that isdiscussed in https://tickets.puppetlabs.com/browse/MODULES-1741.
Contains updated and expanded documentation, and updated spec tests.