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

[José Antonio Rey]

Changed option ip to listenip

Changed option ip to listenip

[Antonio Rosales (arosales)]

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)]

LGTM, +!

review: Approve

=== 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 @@
 
 # Usage
 
-Bip runs on a single server::
+Bip runs on a single server:
 
     juju deploy bip
 

=== 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 @@
 options:
-  ip:
+  listenip:
     type: string
     default: '0.0.0.0'
     description: IP to listen on

=== 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 @@
 charm_dir = os.path.dirname(hook_dir)
 
 listen_port = config().get('listen_port')
-ip = config().get('ip')
+listenip = config().get('listenip')
 pid_file = config().get('pid_file')
 log_directory = config().get('log_directory')
 log_format = config().get('log_format')
@@ -81,7 +81,7 @@
                                 'templates')))
     templ_vars = {
         'listen_port': listen_port,
-        'ip': ip,
+        'listenip': listenip,
         'pid_file': pid_file,
         'log_directory': log_directory,
         'log_format': log_format,

=== 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 @@
-ip = "{{ ip }}";
+ip = "{{ listenip }}";
 
 port = {{ listen_port }};