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

Proposed by Liam Young
Status: Merged
Merged at revision: 86
Proposed branch: lp:~gnuoy/charms/trusty/nova-compute/resurrect-peer-relation
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk
Diff against target: 10 lines (+3/-0)
1 file modified
metadata.yaml (+3/-0)
To merge this branch: bzr merge lp:~gnuoy/charms/trusty/nova-compute/resurrect-peer-relation
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+240093@code.launchpad.net
To post a comment you must log in.
James Page (james-page) :
review: Approve
Ryan Beisner (1chb1n) wrote :

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) wrote :

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/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'metadata.yaml'
2--- metadata.yaml 2014-10-20 10:30:11 +0000
3+++ metadata.yaml 2014-10-30 10:33:15 +0000
4@@ -30,3 +30,6 @@
5 neutron-plugin:
6 interface: neutron-plugin
7 scope: container
8+peers:
9+ compute-peer:
10+ interface: nova

Subscribers

People subscribed via source and target branches