Merge lp:~thedac/charms/trusty/mysql/bug1577556 into lp:charms/trusty/mysql

[David Ames]

Fix Bug#1577556

The traceback in Bug #1577556 shows this error occurs during "load time" as unit-get is executed in the parameter list of get_host_ip. unit-get will not actually be called for real till much later. Allow that time to pass.

Loop testing that caught the original bug (installing many mysqls on loop) has not seen this error with this fix.

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #1927 mysql for thedac mp293576
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1927/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2463 mysql for thedac mp293576
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2463/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #734 mysql for thedac mp293576
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/734/

[Liam Young (gnuoy)]

This is a much better, +1

review: Approve

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/3969/

review: Needs Fixing (automated testing)

[Review Queue (review-queue)]

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/4010/

review: Needs Fixing (automated testing)

=== modified file 'hooks/lib/utils.py'
--- hooks/lib/utils.py	2014-12-17 17:29:07 +0000
+++ hooks/lib/utils.py	2016-05-02 23:31:49 +0000
@@ -148,7 +148,9 @@
     return socket.gethostname()
 
 
-def get_host_ip(hostname=unit_get('private-address')):
+def get_host_ip(hostname=None):
+    if hostname is None:
+        hostname = unit_get('private-address')
     try:
         # Test to see if already an IPv4 address
         socket.inet_aton(hostname)