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
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.
Revision history for this message
Jorge Niedbalski (niedbalski) wrote :

environment: local
machines:
  "0":
    agent-state: started
    agent-version: 1.20.5.1
    dns-name: localhost
    instance-id: localhost
    series: trusty
    state-server-member-status: has-vote
  "1":
    agent-state: started
    agent-version: 1.20.5.1
    dns-name: 10.0.3.160
    instance-id: niedbalski-local-machine-1
    series: trusty
    hardware: arch=amd64
  "2":
    agent-state: started
    agent-version: 1.20.5.1
    dns-name: 10.0.3.169
    instance-id: niedbalski-local-machine-2
    series: trusty
    hardware: arch=amd64
services:
  mysql:
    charm: cs:trusty/mysql-4
    exposed: false
    relations:
      cluster:
      - mysql
      juju-info:
      - rsyslog-forwarder-ha
    units:
      mysql/0:
        agent-state: started
        agent-version: 1.20.5.1
        machine: "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:
    charm: local:trusty/rsyslog-14
    exposed: false
    relations:
      aggregator:
      - rsyslog-forwarder-ha
    units:
      rsyslog/0:
        agent-state: started
        agent-version: 1.20.5.1
        machine: "2"
        open-ports:
        - 514/tcp
        - 514/udp
        public-address: 10.0.3.169
  rsyslog-forwarder-ha:
    charm: local:trusty/rsyslog-forwarder-ha-0
    exposed: false
    relations:
      juju-info:
      - mysql
      syslog:
      - rsyslog
    subordinate-to:
    - mysql

8. By Jorge Niedbalski

Moved readme to readme.md

Revision history for this message
Matt Bruzek (mbruzek) wrote :

+1 LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: