Merge lp://qastaging/~james-page/charms/trusty/nova-cloud-controller/xenial into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

charm_lint_check #238 nova-cloud-controller-next for james-page mp285779
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/238/

charm_unit_test #222 nova-cloud-controller-next for james-page mp285779
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/222/

Besides s/kilo/mitaka in the nova.conf template this looks good. Waiting for final amulet run.

charm_amulet_test #117 nova-cloud-controller-next for james-page mp285779
    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/15019680/
Build: http://10.245.162.36:8080/job/charm_amulet_test/117/

charm_amulet_test #123 nova-cloud-controller-next for james-page mp285779
    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/15022745/
Build: http://10.245.162.36:8080/job/charm_amulet_test/123/

charm_lint_check #372 nova-cloud-controller-next for james-page mp285779
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/372/

charm_unit_test #294 nova-cloud-controller-next for james-page mp285779
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/294/

charm_lint_check #374 nova-cloud-controller-next for james-page mp285779
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/374/

charm_unit_test #297 nova-cloud-controller-next for james-page mp285779
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/297/

charm_amulet_test #146 nova-cloud-controller-next for james-page mp285779
    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/15027227/
Build: http://10.245.162.36:8080/job/charm_amulet_test/146/

James,

This amulet fail is legit. The amulet test was changed

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py 2015-10-16 05:41:09 +0000
+++ tests/basic_deployment.py 2016-02-12 21:25:26 +0000
@@ -195,6 +195,9 @@
             self.keystone_sentry: ['keystone'],
             self.glance_sentry: ['glance-registry', 'glance-api']
         }
+ if self._get_openstack_release_string() >= 'liberty':
+ services[self.nova_cc_sentry].remove('nova-api-ec2')
+ services[self.nova_cc_sentry].remove('nova-objectstore')

That is what is failing:
2016-02-12 17:34:18,008 service_restarted_since DEBUG: Checking that nova-api-ec2 service restarted since 1455298326.0 on nova-cloud-controller/0
nova-cloud-controller/0 `pidof -x nova-api-ec2` returned 1

juju-test.conductor.018-basic-trusty-liberty DEBUG : Got exit code: 1
juju-test.conductor.018-basic-trusty-liberty RESULT : FAIL

charm_lint_check #664 nova-cloud-controller-next for james-page mp285779
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/664/

charm_unit_test #574 nova-cloud-controller-next for james-page mp285779
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/574/

charm_lint_check #666 nova-cloud-controller-next for james-page mp285779
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/666/

charm_unit_test #576 nova-cloud-controller-next for james-page mp285779
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/576/

charm_amulet_test #271 nova-cloud-controller-next for james-page mp285779
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/271/

Looks sane to me.