Fix error raising interface 88/5588/1
authorAdam Israel <adam.israel@canonical.com>
Mon, 16 Oct 2017 18:46:29 +0000 (14:46 -0400)
committerAdam Israel <adam.israel@canonical.com>
Mon, 16 Oct 2017 18:46:29 +0000 (14:46 -0400)
Don't fail if there's an error raising the interface. I'm seeing this
happen because the interface is already up.

Signed-off-by: Adam Israel <adam.israel@canonical.com>
juju-charms/layers/pingpong/reactive/pingpong.py [changed mode: 0644->0755]

old mode 100644 (file)
new mode 100755 (executable)
index b5a5db9..7a91f89
@@ -63,16 +63,16 @@ def start():
         remove_flag('actions.start')
         return
 
+    # Attempt to raise the non-mgmt interface, but ignore failures if
+    # the interface is already up.
     try:
-        cmd =  "sudo timeout 30 /sbin/ifup eth1"
+        cmd = "sudo timeout 30 /sbin/ifup eth1"
         result, err = charms.sshproxy._run(cmd)
     except Exception as e:
-        action_fail('command failed: {}, errors: {}'.format(e, e.output))
-        remove_flag('actions.start')
-        return
+        pass
 
     try:
-        cmd =  "sudo timeout 30 /usr/bin/systemctl start {}". \
+        cmd = "sudo timeout 30 /usr/bin/systemctl start {}". \
               format(cfg['mode'])
         result, err = charms.sshproxy._run(cmd)
     except Exception as e: