Merge lp://qastaging/~1chb1n/charms/trusty/heat/kilo-support into lp://qastaging/~openstack-charmers-archive/charms/trusty/heat/next

charm_lint_check #2484 heat-next for 1chb1n mp251995
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2484/

charm_unit_test #2274 heat-next for 1chb1n mp251995
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2274/

charm_amulet_test #2356 heat-next for 1chb1n mp251995
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10542115/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2356/

Setting back to WIP for P, T, U, V deploy testing.

Deployed in the following combos, confirmed heat-api svc start OK.

p-i
t-i
t-j
t-k

Clear to merge/review from my perspective.

charm_lint_check #2485 heat-next for 1chb1n mp251995
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2485/

charm_unit_test #2275 heat-next for 1chb1n mp251995
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2275/

charm_amulet_test #2357 heat-next for 1chb1n mp251995
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10542331/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2357/

I noticed the symlinks and I think this needs some changes. Here's the documentation on how templates are chosen. http://bazaar.launchpad.net/~charm-helpers/charm-helpers/devel/view/head:/charmhelpers/contrib/openstack/templating.py#L151

charm_lint_check #2486 heat-next for 1chb1n mp251995
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/2486/

charm_unit_test #2276 heat-next for 1chb1n mp251995
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/2276/

charm_amulet_test #2358 heat-next for 1chb1n mp251995
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10542644/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2358/

This looks good to me, except for the one inline comment below.

Also, I think we might need this change across the board for all charms that have similar api config files. We might just be getting lucky so far with those.

Replied inline (tldr, yes on purpose).