Merge lp://staging/~niedbalski/charms/precise/rsyslog-forwarder-ha/fix-no-rel into lp://staging/charms/rsyslog-forwarder-ha
Proposed by
Jorge Niedbalski
Status: | Merged |
---|---|
Merged at revision: | 7 |
Proposed branch: | lp://staging/~niedbalski/charms/precise/rsyslog-forwarder-ha/fix-no-rel |
Merge into: | lp://staging/charms/rsyslog-forwarder-ha |
Diff against target: |
60 lines (+16/-6) 2 files modified
README.md (+10/-3) hooks/hooks.py (+6/-3) |
To merge this branch: | bzr merge lp://staging/~niedbalski/charms/precise/rsyslog-forwarder-ha/fix-no-rel |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matt Bruzek (community) | Approve | ||
Review via email: mp+232454@code.staging.launchpad.net |
Description of the change
- If no relation data is available, then force a die(), otherwise add the server relation.
To post a comment you must log in.
environment: local server- member- status: has-vote local-machine- 1 local-machine- 2 forwarder- ha
agent- state: started
agent- version: 1.20.5.1
public- address: 10.0.3.160
subordinates:
rsyslog- forwarder- ha/0:
upgrading- from: local:trusty/ rsyslog- forwarder- ha-0
agent- state: started
agent- version: 1.20.5.1
public- address: 10.0.3.160 rsyslog- 14 forwarder- ha
agent- state: started
agent- version: 1.20.5.1
public- address: 10.0.3.169 forwarder- ha: rsyslog- forwarder- ha-0
machines:
"0":
agent-state: started
agent-version: 1.20.5.1
dns-name: localhost
instance-id: localhost
series: trusty
state-
"1":
agent-state: started
agent-version: 1.20.5.1
dns-name: 10.0.3.160
instance-id: niedbalski-
series: trusty
hardware: arch=amd64
"2":
agent-state: started
agent-version: 1.20.5.1
dns-name: 10.0.3.169
instance-id: niedbalski-
series: trusty
hardware: arch=amd64
services:
mysql:
charm: cs:trusty/mysql-4
exposed: false
relations:
cluster:
- mysql
juju-info:
- rsyslog-
units:
mysql/0:
machine: "1"
rsyslog:
charm: local:trusty/
exposed: false
relations:
aggregator:
- rsyslog-
units:
rsyslog/0:
machine: "2"
open-ports:
- 514/tcp
- 514/udp
rsyslog-
charm: local:trusty/
exposed: false
relations:
juju-info:
- mysql
syslog:
- rsyslog
subordinate-to:
- mysql