Merge lp:~hopem/charms/trusty/neutron-gateway/ensure-tmpdir-cleanup into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

[Edward Hope-Morley]

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

charm_lint_check #5680 neutron-gateway-next for hopem mp263272
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/5680/

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

charm_unit_test #5312 neutron-gateway-next for hopem mp263272
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/5312/

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

charm_amulet_test #4863 neutron-gateway-next for hopem mp263272
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/11795087/
Build: http://10.245.162.77:8080/job/charm_amulet_test/4863/

[Billy Olsen (billy-olsen)]

Amulet failed due to timeout.

[Billy Olsen (billy-olsen)]

LGTM

review: Approve

=== modified file 'templates/os-charm-phy-nic-mtu.conf'
--- templates/os-charm-phy-nic-mtu.conf	2015-02-11 15:52:33 +0000
+++ templates/os-charm-phy-nic-mtu.conf	2015-06-29 18:05:31 +0000
@@ -7,9 +7,9 @@
 script
     devs="{{ devs }}"
     mtu="{{ mtu }}"
-    tmpfile=`mktemp`
-    echo $devs > $tmpfile
     if [ -n "$mtu" ]; then
+        tmpfile=`mktemp`
+        echo $devs > $tmpfile
         while read -r dev; do
             [ -n "$dev" ] || continue
             rc=0
@@ -19,4 +19,4 @@
         rm $tmpfile
         [ $rc = 0 ] || exit $rc
     fi
-end script
\ No newline at end of file
+end script