From 720bfb06e9354c54915ef4a99aa4579f76a9da32 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Wed, 24 Sep 2014 13:56:03 +0100
Subject: [PATCH] applied jamespage review fixes

---
 hooks/utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hooks/utils.py b/hooks/utils.py
index cd0255d..cb2ab2f 100644
--- a/hooks/utils.py
+++ b/hooks/utils.py
@@ -71,10 +71,10 @@ def get_unit_hostname():
 
 @cached
 def get_host_ip(hostname=None):
-    if config('prefer-ipv6'):
-        return get_ipv6_addr()[0]
-
     hostname = hostname or unit_get('private-address')
+    if config('prefer-ipv6'):
+        return hostname or get_ipv6_addr()[0]
+
     try:
         # Test to see if already an IPv4 address
         socket.inet_aton(hostname)