Merge lp:~ahasenack/landscape-charm/service-names-1379133 into lp:~landscape/landscape-charm/trunk
Status: | Merged |
---|---|
Approved by: | Andreas Hasenack |
Approved revision: | 225 |
Merged at revision: | 210 |
Proposed branch: | lp:~ahasenack/landscape-charm/service-names-1379133 |
Merge into: | lp:~landscape/landscape-charm/trunk |
Diff against target: |
270 lines (+118/-22) 3 files modified
hooks/hooks.py (+46/-9) hooks/lib/util.py (+2/-2) hooks/test_hooks.py (+70/-11) |
To merge this branch: | bzr merge lp:~ahasenack/landscape-charm/service-names-1379133 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chad Smith | Approve | ||
Benji York (community) | Approve | ||
Review via email: mp+238299@code.launchpad.net |
Commit message
Update the haproxy jinja variables in the apache vhost template files according to whatever service name haproxy was deployed as.
Description of the change
Update the haproxy jinja variables in the apache vhost template files according to whatever service name haproxy was deployed as.
The apache charm expects the jinja variables in the vhost template files to be named after the services it relates to. So if haproxy is deployed as "landscape-
An additional complication is that jinja variables need to be proper python, and the apache charm chose to swallow the "-". So we need to apply the same transformation in our side.
This branch looks good. I had one regex simplification and a couple of style nitpicks, but once you consider those you're good to go.