Merge lp:~clint-fewbar/charms/precise/haproxy/trunk into lp:charms/haproxy

[Clint Byrum]

Fixes deploying with bzr-branched juju by removing explicit path from open/close port.

[Juan L. Negron (negronjl)]

LGTM.

-Juan

review: Approve

[Marco Ceppi (marcoceppi)]

Merged in other branch!

Unmerged revisions

61. By Clint Byrum on 2012-10-15

Do not use explicit port for open/close port

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2012-10-03 14:23:29 +0000
+++ hooks/hooks.py	2012-10-15 22:44:19 +0000
@@ -186,7 +186,7 @@
 def open_port(port=None, protocol="TCP"):
     if port is None:
         return(None)
-    return(subprocess.call(['/usr/bin/open-port', "%d/%s" %
+    return(subprocess.call(['open-port', "%d/%s" %
     (int(port), protocol)]))
 
 
@@ -197,7 +197,7 @@
 def close_port(port=None, protocol="TCP"):
     if port is None:
         return(None)
-    return(subprocess.call(['/usr/bin/close-port', "%d/%s" %
+    return(subprocess.call(['close-port', "%d/%s" %
     (int(port), protocol)]))