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

[Liam Young]

[James Page (james-page)]

review: Approve

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #818 trusty-nova-compute for gnuoy mp240093
    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.818:
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/8745293/
Build: http://10.98.191.181:8080/job/charm_lint_check/818/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #626 trusty-nova-compute for gnuoy mp240093
    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.626:
----------------------------------------------------------------------
Ran 56 tests in 2.937s

OK (SKIP=5)

Full unit output: http://paste.ubuntu.com/8745295/
Build: http://10.98.191.181:8080/job/charm_unit_test/626/

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