Merge lp:~jose/charms/precise/bip/1297544-fix into lp:charms/bip

Proposed by José Antonio Rey
Status: Merged
Merged at revision: 17
Proposed branch: lp:~jose/charms/precise/bip/1297544-fix
Merge into: lp:charms/bip
Diff against target: 54 lines (+5/-5)
4 files modified
README.md (+1/-1)
config.yaml (+1/-1)
hooks/hooks.py (+2/-2)
templates/bip_conf.template (+1/-1)
To merge this branch: bzr merge lp:~jose/charms/precise/bip/1297544-fix
Reviewer Review Type Date Requested Status
Marco Ceppi Approve
Review via email: mp+212750@code.launchpad.net

Commit message

Changed option ip to listenip

Description of the change

Changed option ip to listenip

To post a comment you must log in.
Antonio Rosales (arosales) wrote :

Jose,

Thanks for taking the time to improve the Bip charm. Your contribution to improve the Bip charm quality is much appreciated. I too saw this problem with Bip and deduced that charm proof wanted a yaml key that had 3 characters or greater, less than 3 characters filed proof. Your fix resolves that issue.

# I am providing a initial +1 review. A ~charmer will give a final review and merge this request if they don't have any additional feedback.

## Review points:
- charm proof bip' now pass
- deployment in EC2 successful
- I can successfully set the listen port.

### In summary this update to Bip lgtm, and makes charm proof happy.

-thanks,
Atnonio

Marco Ceppi (marcoceppi) wrote :

LGTM, +!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README.md'
2--- README.md 2013-07-18 05:04:09 +0000
3+++ README.md 2014-03-26 00:40:48 +0000
4@@ -9,7 +9,7 @@
5
6 # Usage
7
8-Bip runs on a single server::
9+Bip runs on a single server:
10
11 juju deploy bip
12
13
14=== modified file 'config.yaml'
15--- config.yaml 2013-07-25 05:20:51 +0000
16+++ config.yaml 2014-03-26 00:40:48 +0000
17@@ -1,5 +1,5 @@
18 options:
19- ip:
20+ listenip:
21 type: string
22 default: '0.0.0.0'
23 description: IP to listen on
24
25=== modified file 'hooks/hooks.py'
26--- hooks/hooks.py 2013-07-25 05:20:51 +0000
27+++ hooks/hooks.py 2014-03-26 00:40:48 +0000
28@@ -38,7 +38,7 @@
29 charm_dir = os.path.dirname(hook_dir)
30
31 listen_port = config().get('listen_port')
32-ip = config().get('ip')
33+listenip = config().get('listenip')
34 pid_file = config().get('pid_file')
35 log_directory = config().get('log_directory')
36 log_format = config().get('log_format')
37@@ -81,7 +81,7 @@
38 'templates')))
39 templ_vars = {
40 'listen_port': listen_port,
41- 'ip': ip,
42+ 'listenip': listenip,
43 'pid_file': pid_file,
44 'log_directory': log_directory,
45 'log_format': log_format,
46
47=== modified file 'templates/bip_conf.template'
48--- templates/bip_conf.template 2014-02-11 17:23:53 +0000
49+++ templates/bip_conf.template 2014-03-26 00:40:48 +0000
50@@ -1,4 +1,4 @@
51-ip = "{{ ip }}";
52+ip = "{{ listenip }}";
53
54 port = {{ listen_port }};
55

Subscribers

People subscribed via source and target branches

to all changes: