lp://staging/~dmitriis/charms/trusty/contrail-analytics/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~sdn-charmers/charms/trusty/contrail-analytics/trunk at revision 40

Robert Ayres (community): Approve on 2017-06-29

Ante Karamatić: Pending requested 2017-03-17

Diff: 60 lines (+23/-4)

3 files modified

hooks/contrail_analytics_hooks.py (+7/-1)
hooks/contrail_analytics_utils.py (+10/-3)
templates/contrail-analytics-api.conf (+6/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

38. By Dmitrii Shcherbakov on 2017-03-15

add rbac relation data handling

- updated a check for the required contrail-api relation data depending
on whether rbac is present there
- updated the context and template code to ensure proper config file
rendering

37. By Robert Ayres on 2017-03-10

Merge Ante Karamatic's changes (with modifications)

36. By Robert Ayres on 2017-02-20

Merge Ante Karamatic's changes

35. By Robert Ayres on 2017-02-10

*Add retry logic for provisioning
*Ignore unprovisioning failure

34. By Robert Ayres on 2017-01-19

Change haproxy http check (3.1 requires auth on /analytics url)

33. By Robert Ayres on 2016-11-10

Add keystone services relation for contrail 3.1

32. By Robert Ayres on 2016-10-27

Contrail 3.1 support

31. By Robert Ayres on 2016-10-25

Remove unrequired openstack-origin option, for contrail 3.1 compatibility

30. By Robert Ayres on 2016-10-21

*Add supervisor files for contrail 3.1
*Alter ntpq script for contrail 3.1

29. By Robert Ayres on 2016-10-10

Sync charm helpers