Merge lp:~gandelman-a/charms/precise/nova-compute/nrpe_interface into lp:~charmers/charms/precise/nova-compute/trunk

Proposed by Adam Gandelman on 2013-06-25
Status: Merged
Merged at revision: 46
Proposed branch: lp:~gandelman-a/charms/precise/nova-compute/nrpe_interface
Merge into: lp:~charmers/charms/precise/nova-compute/trunk
Diff against target: 30 lines (+4/-4)
2 files modified
metadata.yaml (+3/-3)
revision (+1/-1)
To merge this branch: bzr merge lp:~gandelman-a/charms/precise/nova-compute/nrpe_interface
Reviewer Review Type Date Requested Status
charmers 2013-06-25 Pending
Review via email: mp+171211@code.launchpad.net

Description of the change

Moves the nrpe-external-master relation interface from 'provides' to 'requires' Having it in requires seems wrong, and is causing ambiguous relation issues with the newly updated rabbitmq-server charm.

To post a comment you must log in.

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 2013-05-20 11:28:14 +0000
3+++ metadata.yaml 2013-06-25 04:28:31 +0000
4@@ -8,9 +8,6 @@
5 provides:
6 cloud-compute:
7 interface: nova-compute
8- nrpe-external-master:
9- interface: nrpe-external-master
10- scope: container
11 requires:
12 shared-db:
13 interface: mysql-shared
14@@ -20,6 +17,9 @@
15 interface: glance
16 ceph:
17 interface: ceph-client
18+ nrpe-external-master:
19+ interface: nrpe-external-master
20+ scope: container
21 peers:
22 compute-peer:
23 interface: nova
24
25=== modified file 'revision'
26--- revision 2013-05-20 11:28:14 +0000
27+++ revision 2013-06-25 04:28:31 +0000
28@@ -1,1 +1,1 @@
29-91
30+92

Subscribers

People subscribed via source and target branches