lp:~ivoks/charms/trusty/contrail-analytics/openstack-ssl

Branch merges

Propose for merging

No branches dependent on this one.

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

Robert Ayres (community): Approve on 2017-03-10

Diff: 263 lines (+134/-7)

11 files modified

charm-helpers-sync.yaml (+1/-0)
config.yaml (+6/-0)
hooks/charmhelpers/contrib/hahelpers/__init__.py (+13/-0)
hooks/charmhelpers/contrib/hahelpers/apache.py (+95/-0)
hooks/contrail_analytics_utils.py (+12/-0)
templates/contrail-alarm-gen.conf (+1/-1)
templates/contrail-analytics-api.conf (+1/-1)
templates/contrail-collector.conf (+2/-2)
templates/contrail-snmp-collector.conf (+1/-1)
templates/contrail-topology.conf (+1/-1)
templates/vnc_api_lib.ini (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Related snap packages

Related bugs

Related blueprints

35. By Ante Karamatić on 2017-01-31

Add support for using OpenStack services with SSL endpoints

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

28. By Robert Ayres on 2016-09-29

Merge Ante Karamatic's changes

27. By Robert Ayres on 2016-08-05

Minor fixes for control-network option

26. By Robert Ayres on 2016-07-29

Add control-network option, fixes lp #1597791