Juju Charms Collection
mem-manager package

Merge lp://qastaging/~celebdor/charms/trusty/mem-manager/multi-rel into lp://qastaging/~celebdor/charms/trusty/mem-manager/trunk

  1. Trusty Tahr (14.04)
  2. multi-rel
  3. Merge into trunk
Proposed by Antoni Segura Puimedon
Status: Merged
Approved by: Antoni Segura Puimedon
Approved revision: 26
Merged at revision: 26
Proposed branch: lp://qastaging/~celebdor/charms/trusty/mem-manager/multi-rel
Merge into: lp://qastaging/~celebdor/charms/trusty/mem-manager/trunk
Diff against target: 4977 lines (+3049/-739)
48 files modified
.bzrignore (+5/-0)
charm-helpers-hooks.yaml (+5/-0)
config.yaml (+75/-24)
hooks/charmhelpers/contrib/network/ip.py (+114/-23)
hooks/charmhelpers/contrib/openstack/utils.py (+603/-200)
hooks/charmhelpers/contrib/python/debug.py (+2/-2)
hooks/charmhelpers/contrib/python/packages.py (+44/-10)
hooks/charmhelpers/contrib/python/rpdb.py (+3/-3)
hooks/charmhelpers/contrib/python/version.py (+2/-2)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+662/-67)
hooks/charmhelpers/contrib/storage/linux/loopback.py (+10/-0)
hooks/charmhelpers/contrib/storage/linux/utils.py (+4/-3)
hooks/charmhelpers/core/hookenv.py (+95/-13)
hooks/charmhelpers/core/host.py (+240/-61)
hooks/charmhelpers/core/services/helpers.py (+30/-5)
hooks/charmhelpers/core/templating.py (+21/-8)
hooks/charmhelpers/core/unitdata.py (+521/-0)
hooks/charmhelpers/fetch/__init__.py (+18/-2)
hooks/charmhelpers/fetch/archiveurl.py (+1/-1)
hooks/charmhelpers/fetch/bzrurl.py (+22/-32)
hooks/charmhelpers/fetch/giturl.py (+20/-23)
hooks/ha-relation-broken (+20/-0)
hooks/ha-relation-changed (+21/-0)
hooks/ha-relation-joined (+29/-0)
hooks/install (+22/-3)
hooks/keystone_api-relation-broken (+0/-3)
hooks/keystone_api-relation-changed (+0/-3)
hooks/keystone_api-relation-joined (+0/-3)
hooks/midonet-relation-broken (+21/-0)
hooks/midonet-relation-changed (+21/-0)
hooks/midonet-relation-joined (+21/-0)
hooks/midonet_api-relation-broken (+0/-3)
hooks/midonet_api-relation-changed (+0/-3)
hooks/midonet_api-relation-joined (+0/-3)
hooks/midonet_helpers/puppet.py (+71/-17)
hooks/midonet_helpers/relations.py (+1/-9)
hooks/midonet_helpers/repositories.py (+34/-6)
hooks/neutron_api-relation-broken (+0/-3)
hooks/neutron_api-relation-changed (+0/-3)
hooks/neutron_api-relation-joined (+0/-3)
hooks/relations.py (+47/-10)
hooks/services.py (+111/-71)
hooks/utils.py (+37/-0)
metadata.yaml (+6/-3)
templates/000-default.conf (+74/-0)
templates/client.js (+6/-6)
templates/midonet-manager.conf (+0/-108)
unit_test_requirements.txt (+10/-0)
To merge this branch: bzr merge lp://qastaging/~celebdor/charms/trusty/mem-manager/multi-rel
Reviewer Review Type Date Requested Status
Antoni Segura Puimedon Pending
Review via email: mp+280664@code.qastaging.launchpad.net

Description of the change

Doubled the relation with midonet-api

To post a comment you must log in.
lp://qastaging/~celebdor/charms/trusty/mem-manager/multi-rel updated
11. By Antoni Segura Puimedon <email address hidden>

add liberty support

12. By Antoni Segura Puimedon <email address hidden>

nginx->apache, ha and ssl only mode

13. By Antoni Segura Puimedon <email address hidden>

add missing charmhelper and fixed the puppet import

14. By Antoni Segura Puimedon <email address hidden>

fix MidoNet API relation name

15. By Antoni Segura Puimedon <email address hidden>

only re-generate certs if not present

16. By Antoni Segura Puimedon <email address hidden>

fix typo in os.path.exists usage

17. By Antoni Segura Puimedon <email address hidden>

update hook points to reflect new relation names

18. By Antoni Segura Puimedon <email address hidden>

fix lacking "not" in the non overwriting ssl cert conditional

19. By Antoni Segura Puimedon <email address hidden>

apache2: enable necessary mod_headers

20. By Antoni Segura Puimedon <email address hidden>

Fix client.js syntax error

21. By Antoni Segura Puimedon <email address hidden>

Fix detection of the manager being up and running

22. By Antoni Segura Puimedon <email address hidden>

fix another darned ',' typo

23. By Antoni Segura Puimedon <email address hidden>

Improve the service available check

the proxying is only for /midonet-api/ not /midonet-api

24. By Antoni Segura Puimedon <email address hidden>

add retrial for checking that the manager is operational

25. By Antoni Segura Puimedon <email address hidden>

Forgot to change the service name nginx->apache2

26. By Antoni Segura Puimedon <email address hidden>

fix refused connection comparison

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches