~hloeung/content-cache-charm:multiple-locations

Branch merges

Propose for merging

Merged into content-cache-charm:master at revision 2496dc3bd537d16344d17b58578565556d414e02

Joel Sing (community): Approve (+1) on 2019-04-18

Nick Moffitt (community): Approve on 2019-04-17

Diff: 274 lines (+146/-11)

9 files modified

reactive/content_cache.py (+5/-6)
tests/unit/files/config_test_config.txt (+19/-1)
tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+40/-1)
tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt (+12/-0)
tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output.txt (+6/-1)
tests/unit/files/haproxy_config_rendered_test_output.txt (+18/-1)
tests/unit/files/nginx_config_rendered_test_output-site6.local.txt (+22/-0)
tests/unit/files/nginx_config_rendered_test_output-site7.local.txt (+22/-0)
tests/unit/test_content_cache.py (+2/-1)

api

Merged into content-cache-charm:master at revision 4957b6cc6e53f3699cd06276e2d7e7189431871f

Joel Sing (community): Approve (+1) on 2019-04-16

Canonical IS Reviewers: Pending requested 2019-04-16

Diff: 519 lines (+205/-127)

5 files modified

lib/haproxy.py (+2/-2)
reactive/content_cache.py (+74/-48)
tests/unit/files/config_test_secrets.txt (+4/-3)
tests/unit/files/content_cache_rendered_haproxy_test_output.txt (+19/-5)
tests/unit/test_content_cache.py (+106/-69)

api

Merged into content-cache-charm:master at revision e023741290070e2e63e3dc4609928464df106b1b

Joel Sing (community): Approve (+1) on 2019-04-16

Diff: 336 lines (+142/-87)

6 files modified

lib/haproxy.py (+64/-41)
tests/unit/files/config_test_config.txt (+55/-40)
tests/unit/files/haproxy_config_rendered_backends_stanzas_test_output.txt (+9/-3)
tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output.txt (+1/-0)
tests/unit/files/haproxy_config_rendered_test_output.txt (+10/-3)
tests/unit/test_haproxy.py (+3/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

12e806d... by Haw Loeung on 2019-04-17

Add missing site7 to test

406f9cc... by Haw Loeung on 2019-04-17

Fixed to support plain HTTP to backends, but have TLS/SSL/HTTPS at the front

15fa2f0... by Haw Loeung on 2019-04-17

Fixed bug with TLS/SSL backends only and add missing unit tests to catch it

0968c9a... by Haw Loeung on 2019-04-17

Move calculating number of HAProxy processes into the library

232b75e... by Haw Loeung on 2019-04-17

Allow overriding proxy cache validity

Reviewed-on: https://code.launchpad.net/~hloeung/content-cache-charm/+git/content-cache-charm/+merge/366154
Reviewed-by: Joel Sing <email address hidden>

f1cdd5c... by Haw Loeung on 2019-04-17

Move defaults out of template and into code; it's easier to read and understand code rather than dive into jinja's substitution

c20372b... by Haw Loeung on 2019-04-17

Allow overriding proxy cache validity

4b43be1... by Haw Loeung on 2019-04-17

Allow overriding backend/proxy path

Reviewed-on: https://code.launchpad.net/~hloeung/content-cache-charm/+git/content-cache-charm/+merge/366153
Reviewed-by: Joel Sing <email address hidden>

03773df... by Haw Loeung on 2019-04-17

Fixed based on reviews

950bb86... by Haw Loeung on 2019-04-17

Allow overriding Nginx's 'location' modifier

Reviewed-on: https://code.launchpad.net/~hloeung/content-cache-charm/+git/content-cache-charm/+merge/366152
Reviewed-by: Joel Sing <email address hidden>