Merge lp://staging/~ivoks/charms/precise/glance/tls-ha into lp://staging/~charmers/charms/precise/glance/trunk
Proposed by
Ante Karamatić
| Status: | Merged |
|---|---|
| Merged at revision: | 45 |
| Proposed branch: | lp://staging/~ivoks/charms/precise/glance/tls-ha |
| Merge into: | lp://staging/~charmers/charms/precise/glance/trunk |
| Diff against target: |
202 lines (+50/-30) 7 files modified
hooks/charmhelpers/contrib/hahelpers/cluster.py (+7/-0) hooks/charmhelpers/contrib/openstack/context.py (+4/-6) hooks/charmhelpers/core/host.py (+9/-3) hooks/glance_contexts.py (+4/-3) hooks/glance_relations.py (+3/-2) templates/haproxy.cfg (+2/-3) unit_tests/test_glance_contexts.py (+21/-13) |
| To merge this branch: | bzr merge lp://staging/~ivoks/charms/precise/glance/tls-ha |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
As part of changing OpenStack charm to provide better SSL experience, we need to put HAproxy in front of the Apache. Apache then does SSL termination on destination host, and HAproxy balances TCP traffic instead of HTTP. This allows us to keep all outside server traffic - crypted.
In addition, we stop and start services, instead of restarting. This avoids TCP port conflicts.
Depends on charm-helpers from: lp:~ivoks/charm-helpers/new-ssl
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
