diff options
author | Dimitri Staessens <[email protected]> | 2018-02-07 13:50:33 +0100 |
---|---|---|
committer | Dimitri Staessens <[email protected]> | 2018-02-07 13:50:33 +0100 |
commit | cc6c27b185ae77e4d214c431a28475bbf66899ef (patch) | |
tree | 1532b341de3245cbbb6b2f5006d63439322286df | |
parent | e0d351a5c2b927cae6c7a0a6b9d6fc1d22b28df4 (diff) | |
download | rumba-cc6c27b185ae77e4d214c431a28475bbf66899ef.tar.gz rumba-cc6c27b185ae77e4d214c431a28475bbf66899ef.zip |
testbeds: Fix local message in jFed testbed
Setting the locale sometimes prevented the warning being shown. This
disables the warning alltogether.
-rw-r--r-- | rumba/testbeds/jfed.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py index 94a06e5..5fdde99 100644 --- a/rumba/testbeds/jfed.py +++ b/rumba/testbeds/jfed.py @@ -269,6 +269,11 @@ class Testbed(mod.Testbed): node_n.ssh_config, "sudo locale-gen en_US.UTF-8 || true") + ssh_support.execute_command( + self, + node_n.ssh_config, + "sudo touch /var/lib/cloud/instance/locale-check.skip || true") + for intf in intfs: aux_mac_address = intf.getAttribute("mac_address") @@ -300,9 +305,9 @@ class Testbed(mod.Testbed): if self.if_id[ipcp] == i_name: ipcp.ifname = ifname if ifname is None or ifname == "": - logger.error("Could not determine name of node" - "%s interface %s" - % (node_n.name, mac)) + raise Exception("Could not determine name of " + "node %s interface %s" + % (node_n.name, mac)) else: logger.debug("Node %s interface %s has name %s." % (node_n.name, mac, ifname)) |