Juju Charms Collection
nova-compute package

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

  1. Precise Pangolin (12.04)
  2. nrpe_interface
  3. Merge into trunk
Proposed by Adam Gandelman
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 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
=== modified file 'metadata.yaml'
--- metadata.yaml 2013-05-20 11:28:14 +0000
+++ metadata.yaml 2013-06-25 04:28:31 +0000
@@ -8,9 +8,6 @@
8provides:8provides:
9 cloud-compute:9 cloud-compute:
10 interface: nova-compute10 interface: nova-compute
11 nrpe-external-master:
12 interface: nrpe-external-master
13 scope: container
14requires:11requires:
15 shared-db:12 shared-db:
16 interface: mysql-shared13 interface: mysql-shared
@@ -20,6 +17,9 @@
20 interface: glance17 interface: glance
21 ceph:18 ceph:
22 interface: ceph-client19 interface: ceph-client
20 nrpe-external-master:
21 interface: nrpe-external-master
22 scope: container
23peers:23peers:
24 compute-peer:24 compute-peer:
25 interface: nova25 interface: nova
2626
=== modified file 'revision'
--- revision 2013-05-20 11:28:14 +0000
+++ revision 2013-06-25 04:28:31 +0000
@@ -1,1 +1,1 @@
191192

Subscribers

People subscribed via source and target branches