Merge lp:~ivoks/charm-helpers/new-ssl into lp:charm-helpers
Proposed by
Ante Karamatić
Status: | Merged |
---|---|
Merged at revision: | 117 |
Proposed branch: | lp:~ivoks/charm-helpers/new-ssl |
Merge into: | lp:charm-helpers |
Diff against target: |
163 lines (+30/-24) 6 files modified
charmhelpers/contrib/hahelpers/cluster.py (+4/-4) charmhelpers/contrib/openstack/context.py (+4/-6) charmhelpers/contrib/openstack/templates/haproxy.cfg (+2/-3) charmhelpers/core/host.py (+9/-3) tests/contrib/hahelpers/test_cluster_utils.py (+7/-5) tests/contrib/openstack/test_os_contexts.py (+4/-3) |
To merge this branch: | bzr merge lp:~ivoks/charm-helpers/new-ssl |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Page | Approve | ||
Review via email: mp+206629@code.launchpad.net |
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, this branch extends restart_on_change() to provide stop/start in addition to restart. This is required when restarting services that might switch TCP ports, depending on changes in relation.
To post a comment you must log in.