Merge lp:~gnuoy/charms/trusty/nova-compute/lp1506046 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Liam Young]

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #11895 nova-compute-next for gnuoy mp274416
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #11063 nova-compute-next for gnuoy mp274416
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7336 nova-compute-next for gnuoy mp274416
    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/12783201/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7336/

[Ryan Beisner (1chb1n)]

Hi @gnuoy

This amulet fail is a scenario where things were just not quite ready when a test tried to do an operation.

I have a WIP helper to leverage extended status messages to confirm readiness before amulet tests proceed ... which I will be working like mad to squeeze into the next charm tests before the 15.10 push.

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7374 nova-compute-next for gnuoy mp274416
    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/12796458/
Build: http://10.245.162.77:8080/job/charm_amulet_test/7374/

[lp:~gnuoy/charms/trusty/nova-compute/lp1506046]

177. By Liam Young on 2015-10-19

Merged next in

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #12155 nova-compute-next for gnuoy mp274416
    LINT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #11287 nova-compute-next for gnuoy mp274416
    UNIT OK: passed

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

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7426 nova-compute-next for gnuoy mp274416
    AMULET OK: passed

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

[James Page (james-page)]

review: Approve

=== modified file 'hooks/nova_compute_utils.py'
--- hooks/nova_compute_utils.py	2015-10-06 16:58:22 +0000
+++ hooks/nova_compute_utils.py	2015-10-19 06:58:53 +0000
@@ -556,7 +556,7 @@
     apt_upgrade(options=dpkg_opts, fatal=True, dist=True)
     apt_install(determine_packages(), fatal=True)
 
-    # Regenerate configs in full for new release
+    configs.set_release(openstack_release=new_os_rel)
     configs.write_all()
     [service_restart(s) for s in services()]
 

=== modified file 'templates/juno/nova.conf'
--- templates/juno/nova.conf	2015-10-08 21:38:25 +0000
+++ templates/juno/nova.conf	2015-10-19 06:58:53 +0000
@@ -1,4 +1,4 @@
-# havana
+# juno
 ###############################################################################
 # [ WARNING ]
 # Configuration file maintained by Juju. Local changes may be overwritten.