Skip to content

<fix>[kvm]: trigger nested config deploy #3989

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

Closed
zstack-robot-2 wants to merge 1 commit into from
+14 −0
Closed

<fix>[kvm]: trigger nested config deploy #3989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions plugin/kvm/src/main/java/org/zstack/kvm/KVMConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ public interface KVMConstant {
public static final String L2_PROVIDER_TYPE_LINUX_BRIDGE = "LinuxBridge";

public static final String DHCP_BIN_FILE_PATH = "/usr/local/zstack/dnsmasq";
String NESTED_KVM_CONF_FILE_PATH = "/etc/modprobe.d/kvm-nested.conf";
String KVM_HOST_NETWORK_INTERFACE_DEFAULT = "None";

enum KvmVmState {
Expand Down
13 changes: 13 additions & 0 deletions plugin/kvm/src/main/java/org/zstack/kvm/KVMHost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5804,6 +5804,13 @@ public void run(final FlowTrigger trigger, Map data) {
dhcpChecker.setTargetIp(getSelf().getManagementIp());
dhcpChecker.setFilePath(KVMConstant.DHCP_BIN_FILE_PATH);

SshFileExistChecker nestedKvmConfChecker = new SshFileExistChecker();
nestedKvmConfChecker.setUsername(getSelf().getUsername());
nestedKvmConfChecker.setPassword(getSelf().getPassword());
nestedKvmConfChecker.setSshPort(getSelf().getPort());
nestedKvmConfChecker.setTargetIp(getSelf().getManagementIp());
nestedKvmConfChecker.setFilePath(KVMConstant.NESTED_KVM_CONF_FILE_PATH);

SshChronyConfigChecker chronyChecker = new SshChronyConfigChecker();
chronyChecker.setTargetIp(getSelf().getManagementIp());
chronyChecker.setUsername(getSelf().getUsername());
Expand Down Expand Up @@ -5834,6 +5841,12 @@ public void run(final FlowTrigger trigger, Map data) {
AnsibleRunner runner = new AnsibleRunner();
runner.installChecker(checker);
runner.installChecker(dhcpChecker);
String architecture = getSelf().getArchitecture();
if (CpuArchitecture.x86_64.name().equals(architecture)) {
runner.installChecker(nestedKvmConfChecker);
} else if (architecture == null) {
logger.debug(String.format("skip nested KVM config checker for host[uuid:%s] because architecture is null", getSelf().getUuid()));
}
runner.installChecker(chronyChecker);
runner.installChecker(repoChecker);
runner.installChecker(callbackChecker);
Expand Down