Merge lp://qastaging/~corey.bryant/charms/trusty/keystone/action-managed-upgrade into lp://qastaging/~openstack-charmers-archive/charms/trusty/keystone/next

charm_lint_check #10050 keystone-next for corey.bryant mp271143
    LINT OK: passed

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

charm_unit_test #9217 keystone-next for corey.bryant mp271143
    UNIT OK: passed

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

charm_amulet_test #6437 keystone-next for corey.bryant mp271143
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

charm_unit_test #9224 keystone-next for corey.bryant mp271143
    UNIT OK: passed

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

charm_lint_check #10060 keystone-next for corey.bryant mp271143
    LINT OK: passed

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

charm_amulet_test #6447 keystone-next for corey.bryant mp271143
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

When I ran the upgrade action, I required a subsequent config-changed manual hook run in order to get the upgrade to work properly. The initial run of the openstack-ugprade action did upgrade all of the necessary packages, however the template rendering engine rendered kilo, then rendered icehouse templates (from which I was ugprading from). Digging into this a bit, I suspect its due to the way that the charmhelpers.contrib.openstack.utils.get_os_codename_package works. Since this is determined as part of register_configs(), which happens prior to the upgrade, the package versions are kept at the icehouse level which causes the icehouse templates to be rendered. I noticed this because I experienced bug https://bugs.launchpad.net/charms/+source/keystone/+bug/1417211 upon upgrade, then realized that this is due to rendering the icehouse template as can be seen at http://paste.ubuntu.com/12517976/.

Hmm, I see the same configs setting is on other MPs for the action ugprade as well, however they do *NOT* experience the kilo/icehouse/kilo issue. I think this warrants further investigation as to what specifically the root cause of this is.

charm_lint_check #10468 keystone-next for corey.bryant mp271143
    LINT OK: passed

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

charm_unit_test #9659 keystone-next for corey.bryant mp271143
    UNIT OK: passed

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

charm_amulet_test #6611 keystone-next for corey.bryant mp271143
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

charm_lint_check #10696 keystone-next for corey.bryant mp271143
    LINT OK: passed

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

charm_unit_test #9877 keystone-next for corey.bryant mp271143
    UNIT OK: passed

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

charm_amulet_test #6740 keystone-next for corey.bryant mp271143
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

charm_amulet_test #6745 keystone-next for corey.bryant mp271143
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

charm_amulet_test #6753 keystone-next for corey.bryant mp271143
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

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

Note that in my latest commit to this mp I reverted charm-helper changes to service_pause() and service_resume() which was causing amulet tests to fail. ack is looking into fixing those tests, but for now we should be ok merging this mp without those updates.

charm_lint_check #10775 keystone-next for corey.bryant mp271143
    LINT OK: passed

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

charm_unit_test #9952 keystone-next for corey.bryant mp271143
    UNIT OK: passed

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

charm_amulet_test #6780 keystone-next for corey.bryant mp271143
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6780/

In response to Billy's find above, we've moved all of the action-managed upgrade code to import CONFIGS instead of calling register_configs() (see commit #185 below). Having 2 calls to register_configs() was causing issues.

charm_lint_check #11539 keystone-next for corey.bryant mp271143
    LINT OK: passed

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

charm_unit_test #10731 keystone-next for corey.bryant mp271143
    UNIT OK: passed

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

Missing the openstack-upgrade symlink.
Still approved. I'll add the symlink at merge time.

charm_amulet_test #7242 keystone-next for corey.bryant mp271143
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7242/