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.
Revision history for this message
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

Revision history for this message
Marco Ceppi (marcoceppi) wrote :

LGTM, +!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'README.md'
--- README.md 2013-07-18 05:04:09 +0000
+++ README.md 2014-03-26 00:40:48 +0000
@@ -9,7 +9,7 @@
99
10# Usage10# Usage
1111
12Bip runs on a single server::12Bip runs on a single server:
1313
14 juju deploy bip14 juju deploy bip
1515
1616
=== modified file 'config.yaml'
--- config.yaml 2013-07-25 05:20:51 +0000
+++ config.yaml 2014-03-26 00:40:48 +0000
@@ -1,5 +1,5 @@
1options:1options:
2 ip:2 listenip:
3 type: string3 type: string
4 default: '0.0.0.0'4 default: '0.0.0.0'
5 description: IP to listen on5 description: IP to listen on
66
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py 2013-07-25 05:20:51 +0000
+++ hooks/hooks.py 2014-03-26 00:40:48 +0000
@@ -38,7 +38,7 @@
38charm_dir = os.path.dirname(hook_dir)38charm_dir = os.path.dirname(hook_dir)
3939
40listen_port = config().get('listen_port')40listen_port = config().get('listen_port')
41ip = config().get('ip')41listenip = config().get('listenip')
42pid_file = config().get('pid_file')42pid_file = config().get('pid_file')
43log_directory = config().get('log_directory')43log_directory = config().get('log_directory')
44log_format = config().get('log_format')44log_format = config().get('log_format')
@@ -81,7 +81,7 @@
81 'templates')))81 'templates')))
82 templ_vars = {82 templ_vars = {
83 'listen_port': listen_port,83 'listen_port': listen_port,
84 'ip': ip,84 'listenip': listenip,
85 'pid_file': pid_file,85 'pid_file': pid_file,
86 'log_directory': log_directory,86 'log_directory': log_directory,
87 'log_format': log_format,87 'log_format': log_format,
8888
=== modified file 'templates/bip_conf.template'
--- templates/bip_conf.template 2014-02-11 17:23:53 +0000
+++ templates/bip_conf.template 2014-03-26 00:40:48 +0000
@@ -1,4 +1,4 @@
1ip = "{{ ip }}";1ip = "{{ listenip }}";
22
3port = {{ listen_port }};3port = {{ listen_port }};
44

Subscribers

People subscribed via source and target branches

to all changes: