Merge lp:~cmars/charms/precise/haproxy/trunk into lp:charms/haproxy
Status: | Work in progress |
---|---|
Proposed branch: | lp:~cmars/charms/precise/haproxy/trunk |
Merge into: | lp:charms/haproxy |
Diff against target: |
217 lines (+106/-6) 3 files modified
config.yaml (+48/-0) hooks/charmhelpers/fetch/__init__.py (+19/-2) hooks/hooks.py (+39/-4) |
To merge this branch: | bzr merge lp:~cmars/charms/precise/haproxy/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Benjamin Saller (community) | Needs Fixing | ||
Casey Marshall (community) | Needs Information | ||
Marco Ceppi (community) | Needs Fixing | ||
Review via email:
|
Description of the change
Added config support alternate installation sources & keys.
Added config for SSL certificate to support reverse proxy SSL termination. Note that this option is only valid if you install a recent development build of haproxy 1.5. I have packaged haxproxy 1.5-dev in ppa:cloud-green/ppa if you're interested. However, if you don't specify this option & leave default (empty string), older haproxy packages should still work ok.
Unmerged revisions
- 83. By Casey Marshall
-
Append http:// repo sources to a distinct file in /etc/apt/
sources. list.d/
instead of mucking up the main sources.list. - 82. By Casey Marshall
-
Split out SSL certificate, private key and ca cert chain options per hloeung suggestion.
- 81. By Casey Marshall
-
apt-add-repository wasn't add repos by http: URL properly.
Fixed charmhelpers.fetch.add_ source for this case. - 80. By Casey Marshall
-
Only configure_sources() if install_sources & install_keys is set,
otherwise it will raise an exception.
To prevent charm deployers attempting to use the 'ssl_cert' config option with Haproxy < 1.5 perhaps adding a caveat to the option's description would help?
Example:
ssl_cert:
default: ""
type: string
description: |
This option is only supported in Haproxy >= 1.5
Use this SSL certificate for frontend SSL termination, if specified.
This should be a concatenation of:
[...]