Merge lp://staging/~bloodearnest/charm-haproxy/make-service-options-optional into lp://staging/charm-haproxy

Proposed by Simon Davy
Status: Merged
Approved by: Nick Moffitt
Approved revision: 109
Merged at revision: 118
Proposed branch: lp://staging/~bloodearnest/charm-haproxy/make-service-options-optional
Merge into: lp://staging/charm-haproxy
Diff against target: 10 lines (+1/-1)
1 file modified
hooks/hooks.py (+1/-1)
To merge this branch: bzr merge lp://staging/~bloodearnest/charm-haproxy/make-service-options-optional
Reviewer Review Type Date Requested Status
Adam Collard (community) Approve
Review via email: mp+321567@code.staging.launchpad.net

Commit message

Add an empty default for service_options.

This means that you can deploy haproxy with a services config that specifies service_host/service_port, but not options. This allows the relation to specify options, but the haproxy services config can specify ports.

Description of the change

Add an empty default for service_options.

This means that you can deploy haproxy with a services config that specifies service_host/service_port, but not options. This allows the relation to specify options, but the haproxy services config can specify ports.

To post a comment you must log in.
Revision history for this message
Caio Begotti (caio1982) wrote :

This is an actual usage of this: https://pastebin.canonical.com/184470/

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Adam Collard (adam-collard) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 118

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: