lp:~free.ekanayaka/landscape-charm/fix-charm-offiline-paths-for-14.10

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~landscape/landscape-charm/trunk at revision 218

Adam Collard (community): Approve on 2015-01-19

David Britton (community): Approve on 2015-01-19

Landscape: Pending requested 2015-01-19

Diff: 339 lines (+261/-5)

6 files modified

config/vhost.tmpl.legacy (+66/-0)
config/vhostssl.tmpl.legacy (+61/-0)
hooks/conf/landscape-http.legacy (+62/-0)
hooks/hooks.py (+17/-4)
hooks/test_hooks.py (+54/-0)
tests/01-begin.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1411444: trunk charm no longer deploys 13.09, 14.10	High	Fix Released
Bug #1411446: trunk charm + trunk lds test error	High	Fix Released

Link a bug report

Related blueprints

225. By Free Ekanayaka on 2015-01-19

Use assertIn

224. By Free Ekanayaka on 2015-01-19

Revert spurious change to landscape-deployments.yaml

223. By Free Ekanayaka on 2015-01-19

Pass --compressed to curl

222. By Free Ekanayaka on 2015-01-19

Add tests

221. By Free Ekanayaka on 2015-01-19

Add a test for vhost templates

220. By Free Ekanayaka on 2015-01-19

Add a test for vhost templates

219. By Free Ekanayaka on 2015-01-19

Use legacy apache conf if needed

218. By Free Ekanayaka on 2015-01-16

Use old apache/haproxy configs for lds<=14.10

217. By David Britton on 2015-01-15

Merge strip-url-newline-1411353 [f=1411353] [r=ahasenack,adam-collard] [a=David Britton]
Strip newlines from url before passing to cURL.

216. By Free Ekanayaka on 2015-01-12

Merge offline-assets-charm [f=1409670] [r=tealeg,ack] [a=Free Ekanayaka]
Change configuration code to point apache and haproxy to the new
offline pages locations introduced in:

https://code.launchpad.net/~free.ekanayaka/landscape/offline-assets/+merge/245889