Skip to content

ubuntu16: fix three issues with ubuntu 16.04 hosts #3227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 3 commits into from
May 5, 2019
Merged

ubuntu16: fix three issues with ubuntu 16.04 hosts #3227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73fabb5
ubuntu16: fix unable to add host if cloudbrX is not configured
ustcweizhou Mar 14, 2019
04a447c
ubuntu16: Stop service libvirt-bin.socket while add a host
ustcweizhou Mar 14, 2019
fd8fff4
ubuntu16: Diable libvirt default network
ustcweizhou Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ...rvisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import org.libvirt.DomainSnapshot;
import org.libvirt.LibvirtException;
import org.libvirt.MemoryStatistic;
import org.libvirt.Network;
import org.libvirt.NodeInfo;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Expand Down Expand Up @@ -925,6 +926,20 @@ public boolean configure(final String name, final Map<String, Object> params) th
throw new CloudRuntimeException(e.getMessage());
}

// destroy default network, see https://libvirt.org/sources/java/javadoc/org/libvirt/Network.html
try {
Network network = conn.networkLookupByName("default");
s_logger.debug("Found libvirt default network, destroying it and setting autostart to false");
if (network.isActive() == 1) {
network.destroy();
}
if (network.getAutostart()) {
network.setAutostart(false);
}
} catch (final LibvirtException e) {
s_logger.warn("Ignoring libvirt error.", e);
}

if (HypervisorType.KVM == _hypervisorType) {
/* Does node support HVM guest? If not, exit */
if (!IsHVMEnabled(conn)) {
Expand Down
3 changes: 3 additions & 0 deletions python/lib/cloudutils/networkConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ def isBridge(devName):

@staticmethod
def isOvsBridge(devName):
cmd = bash("which ovs-vsctl")
if not cmd.isSuccess():
return False
try:
return 0==subprocess.check_call(("ovs-vsctl", "br-exists", devName))
except subprocess.CalledProcessError:
Expand Down
2 changes: 2 additions & 0 deletions python/lib/cloudutils/serviceConfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,8 @@ def config(self):

self.syscfg.svo.stopService("libvirt-bin")
self.syscfg.svo.enableService("libvirt-bin")
if os.path.exists("/lib/systemd/system/libvirt-bin.socket"):
bash("systemctl stop libvirt-bin.socket")
return True
except:
raise
Expand Down