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

[Liam Young]

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #814 nova-compute-next for gnuoy mp239964
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.814:
I: config.yaml: option config-flags has no default value
I: config.yaml: option instances-path has no default value
W: config.yaml: option disable-neutron-security-groups has no default value
I: config.yaml: option migration-auth-type has no default value

Full lint output: http://paste.ubuntu.com/8730978/
Build: http://10.98.191.181:8080/job/charm_lint_check/814/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #622 nova-compute-next for gnuoy mp239964
    UNIT OK: believed to pass, but you should confirm results

UNIT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.622:
----------------------------------------------------------------------
Ran 56 tests in 2.848s

OK (SKIP=5)

Full unit output: http://paste.ubuntu.com/8730980/
Build: http://10.98.191.181:8080/job/charm_unit_test/622/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #308 nova-compute-next for gnuoy mp239964
    AMULET OK: believed to pass, but you should confirm results

AMULET Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_amulet_test/make-test.308:
juju-test.conductor DEBUG : Tearing down osci-sv05 juju environment
juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet output: http://paste.ubuntu.com/8731225/
Build: http://10.98.191.181:8080/job/charm_amulet_test/308/

[JuanJo Ciarlante (jjo)]

LGTM

review: Approve

[James Page (james-page)]

review: Approve

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-10-20 10:30:11 +0000
+++ metadata.yaml	2014-10-29 10:00:47 +0000
@@ -30,3 +30,6 @@
   neutron-plugin:
     interface: neutron-plugin
     scope: container
+peers:
+  compute-peer:
+    interface: nova