Merge lp:~ihashacks/charms/precise/puppetmaster/misc-fixes_relation-set_pm into lp:charms/puppetmaster

Proposed by Brandon Pierce
Status: Rejected
Rejected by: Stuart Bishop
Proposed branch: lp:~ihashacks/charms/precise/puppetmaster/misc-fixes_relation-set_pm
Merge into: lp:charms/puppetmaster
Diff against target: 11 lines (+1/-1)
1 file modified
hooks/puppetmaster-relation-changed (+1/-1)
To merge this branch: bzr merge lp:~ihashacks/charms/precise/puppetmaster/misc-fixes_relation-set_pm
Reviewer Review Type Date Requested Status
Mark Mims (community) Needs Resubmitting
Review via email: mp+152814@code.launchpad.net

Description of the change

revno: 7
committer: Brandon Pierce <email address hidden>
branch nick: puppetmaster-misc-fixes_relation-set_pm
timestamp: Thu 2013-03-07 07:41:58 -0800
message:
  changed relation settings to use names instead of IPs

To post a comment you must log in.
Revision history for this message
Mark Mims (mark-mims) wrote :

dependent (highly) on https://code.launchpad.net/~ihashacks/charms/precise/puppet/misc-fixes_relation-set_pm/+merge/152815 landing. I don't know how to link the two MPs, so let's just resubmit them together please.

review: Needs Resubmitting

Unmerged revisions

7. By Brandon Pierce

changed relation settings to use names instead of IPs

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/puppetmaster-relation-changed'
2--- hooks/puppetmaster-relation-changed 2012-04-16 16:39:41 +0000
3+++ hooks/puppetmaster-relation-changed 2013-03-12 03:56:21 +0000
4@@ -7,7 +7,7 @@
5 exit 0
6 fi
7
8-host=`relation-get private-address`
9+host=`relation-get puppet-agent`
10
11 cert_fingerprint=`puppet cert fingerprint $host`
12

Subscribers

People subscribed via source and target branches

to all changes: