From e18482dbe1c7bacf08c66f530d158c6988dce7bc Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Mon, 2 Feb 2015 10:26:01 -0500 Subject: [PATCH] Remove ppa and fix up networking a bit more Signed-off-by: Chuck Short --- contrib/devstack/lib/lxd | 2 -- nclxd/nova/virt/lxd/vif.py | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/devstack/lib/lxd b/contrib/devstack/lib/lxd index 47c3d367..8ebcf7ed 100644 --- a/contrib/devstack/lib/lxd +++ b/contrib/devstack/lib/lxd @@ -19,8 +19,6 @@ LXC_DIR=$DEST/python2-lxc function configure_lxd { install_package python-software-properties - sudo apt-add-repository -y ppa:ubuntu-lxc/lxd-daily - sudo apt-add-repository -y ppa:ubuntu-lxc/stable apt_get update install_package golang diff --git a/nclxd/nova/virt/lxd/vif.py b/nclxd/nova/virt/lxd/vif.py index b0f4e461..3dfd317e 100644 --- a/nclxd/nova/virt/lxd/vif.py +++ b/nclxd/nova/virt/lxd/vif.py @@ -100,6 +100,9 @@ class LXDOpenVswitchDriver(object): linux_net.delete_ovs_vif_port(self._get_bridge_name(vif), v2_name) + if linux_net.device_exists(v2_name): + utils.execute('ip', 'link', 'set', v2_name, 'down', + run_as_root=True) except processutils.ProcessExecutionError: LOG.exception(_("Failed while unplugging vif"), instance=instance)