lp:~ivoks/charms/trusty/neutron-api-contrail/openstack-ssl

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk at revision 15

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

Diff: 287 lines (+170/-4)

9 files modified

charm-helpers-sync.yaml (+1/-0)
config.yaml (+6/-0)
hooks/charmhelpers/contrib/__init__.py (+13/-0)
hooks/charmhelpers/contrib/hahelpers/__init__.py (+13/-0)
hooks/charmhelpers/contrib/hahelpers/apache.py (+95/-0)
hooks/neutron_api_contrail_hooks.py (+6/-2)
hooks/neutron_api_contrail_utils.py (+18/-0)
templates/ContrailPlugin.ini (+2/-2)
templates/vnc_api_lib.ini (+16/-0)

api

Related source package recipes

No recipes using this branch. (?)

Related snap packages

Related bugs

Related blueprints

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

SSL support

14. By Robert Ayres on 2016-10-10

Sync charm helpers

13. By Robert Ayres on 2016-09-27

Merge Ante Karamatic's changes

12. By Robert Ayres on 2016-05-19

Support lbaasv2 plugin, fixes lp #1557835

11. By Robert Ayres on 2016-05-07

Update authtoken settings for liberty, fixes lp #1576447

10. By Robert Ayres on 2015-12-18

Add keystone authtoken to config, needed for Kilo, fixes lp #1517153

9. By Robert Ayres on 2015-10-23

*Update README
*Add comments

8. By Robert Ayres on 2015-10-13

Specify quota driver using new method

7. By Robert Ayres on 2015-10-05

Merge Tony Liu's changes

6. By Robert Ayres on 2015-09-18

Sync charm helpers