Juju Charms Collection
redis-master package

Merge lp:~pavel-pachkovskij/charms/precise/redis-master/redis-charms-fix-lxc-support into lp:charms/redis-master

  1. Precise Pangolin (12.04)
  2. redis-charms-fix-lxc-support
  3. Merge into trunk
Proposed by Pavel Pachkovskij
Status: Merged
Approved by: Mark Mims
Approved revision: 5
Merge reported by: Mark Mims
Merged at revision: not available
Proposed branch: lp:~pavel-pachkovskij/charms/precise/redis-master/redis-charms-fix-lxc-support
Merge into: lp:charms/redis-master
Diff against target: 38 lines (+3/-3)
3 files modified
hooks/install (+1/-1)
hooks/redis-admin-relation-joined (+1/-1)
hooks/redis-master-relation-joined (+1/-1)
To merge this branch: bzr merge lp:~pavel-pachkovskij/charms/precise/redis-master/redis-charms-fix-lxc-support
Reviewer Review Type Date Requested Status
Mark Mims (community) Approve
Review via email: mp+147335@code.launchpad.net

Description of the change

Wasn't discoverable in local environment due to
MY_HOSTNAME=`hostname -f`

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

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2013-02-06 18:14:14 +0000
3+++ hooks/install 2013-02-08 10:04:30 +0000
4@@ -16,7 +16,7 @@
5 # Set some variables
6 ############################################################################################################
7
8-MY_HOSTNAME=`hostname -f`
9+MY_HOSTNAME=`unit-get public-address`
10
11 ############################################################################################################
12 # Modify the redis-server configuration file
13
14=== modified file 'hooks/redis-admin-relation-joined'
15--- hooks/redis-admin-relation-joined 2011-10-13 08:12:21 +0000
16+++ hooks/redis-admin-relation-joined 2013-02-08 10:04:30 +0000
17@@ -10,7 +10,7 @@
18 # Set global variables
19 ############################################################################################################
20
21-MY_HOSTNAME=`hostname -f`
22+MY_HOSTNAME=`unit-get public-address`
23
24 ############################################################################################################
25 # Set the hostname in the relation so it can be picked up by the _other_ side
26
27=== modified file 'hooks/redis-master-relation-joined'
28--- hooks/redis-master-relation-joined 2011-10-13 08:12:21 +0000
29+++ hooks/redis-master-relation-joined 2013-02-08 10:04:30 +0000
30@@ -10,7 +10,7 @@
31 # Set global variables
32 ############################################################################################################
33
34-MY_HOSTNAME=`hostname -f`
35+MY_HOSTNAME=`unit-get public-address`
36 MY_PORT="6379"
37
38 ############################################################################################################

Subscribers

People subscribed via source and target branches

to all changes: