Skip to content
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

Jump to bottom

Fix racing cluster FIPS settings #235

Merged
merged 1 commit into from
Apr 6, 2022
Merged

Fix racing cluster FIPS settings #235

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
2 changes: 2 additions & 0 deletions backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ private boolean initVirtResources() {
processStoragePoolStatus();
runUpdateMomPolicy(getCluster(), getVds());
refreshHostDeviceList();
// Check FIPS compatibility
resourceManager.getEventListener().handleVdsFips(getVdsId());
} else {
Map<String, String> customLogValues = new HashMap<>();
customLogValues.put("StoragePoolName", getStoragePoolName());
Expand Down
3 changes: 0 additions & 3 deletions ...d/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,6 @@ private void handleRefreshCapabilitiesResponse(VDS vds, VDSReturnValue caps) {

// Always check VdsVersion
resourceManager.getEventListener().handleVdsVersion(vds.getId());

// Check FIPS compatibility
resourceManager.getEventListener().handleVdsFips(vds.getId());
}
}
}
Expand Down
1 change: 0 additions & 1 deletion ...es/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/HostMonitoring.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,6 @@ public void afterRefreshTreatment() {

if (refreshedCapabilities) {
getVdsEventListener().handleVdsVersion(vds.getId());
getVdsEventListener().handleVdsFips(vds.getId());
markIsSetNonOperationalExecuted();
}

Expand Down
14 changes: 0 additions & 14 deletions ...ommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,6 @@ private void updateProperties() {

setKernelFeatures(formatKernelFeatures(vds.getKernelFeatures()));
setvncEncryptionEnabled(vds.isVncEncryptionEnabled());
setFipsEnabled(vds.isFipsEnabled());
setOvnConfigured(vds.isOvnConfigured());
}

Expand Down Expand Up @@ -1254,19 +1253,6 @@ public void setvncEncryptionEnabled(boolean value) {
}
}

private boolean fipsEnabled;

public boolean isFipsEnabled() {
return fipsEnabled;
}

public void setFipsEnabled(boolean value) {
if (fipsEnabled != value) {
fipsEnabled = value;
onPropertyChanged(new PropertyChangedEventArgs("fipsEnabled")); //$NON-NLS-1$
}
}

private String hostName;

public void setHostName(String hostName) {
Expand Down
2 changes: 0 additions & 2 deletions ...min/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3557,8 +3557,6 @@ public interface ApplicationConstants extends CommonApplicationConstants {

String vncEncryptionLabel();

String fipsEnabledLabel();

String ovnConfiguredLabel();

String vdsmName();
Expand Down
4 changes: 1 addition & 3 deletions ...n/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/HostGeneralSubTabView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ interface ViewIdHandler extends ElementIdHandler<HostGeneralSubTabView> {
StringValueLabel clusterCompatibilityVersion = new StringValueLabel();
StringValueLabel hugePages = new StringValueLabel();
BooleanTextBoxLabel vncEncryptionEnabled = new BooleanTextBoxLabel(constants.enabled(), constants.disabled());
BooleanTextBoxLabel fipsEnabled = new BooleanTextBoxLabel(constants.enabled(), constants.disabled());
BooleanTextBoxLabel ovnConfigured = new BooleanTextBoxLabel(constants.yes(), constants.no());

MemorySizeTextBoxLabel<Integer> physicalMemory = new MemorySizeTextBoxLabel<>();
Expand Down Expand Up @@ -212,7 +211,7 @@ private void generateSoftwareFormPanel() {
boolean glusterSupported = ApplicationModeHelper.isModeSupported(ApplicationMode.GlusterOnly);

// Build a form using the FormBuilder
softwareFormBuilder = new FormBuilder(softwareFormPanel, 1, 15);
softwareFormBuilder = new FormBuilder(softwareFormPanel, 1, 14);
softwareFormBuilder.setRelativeColumnWidth(0, 12);
softwareFormBuilder.addFormItem(new FormItem(constants.osVersionHostGeneral(), oS, 0).withAutoPlacement(), 2, 10);
softwareFormBuilder.addFormItem(new FormItem(constants.osPrettyName(), osPrettyName, 0).withAutoPlacement(), 2, 10);
Expand All @@ -239,7 +238,6 @@ private void generateSoftwareFormPanel() {
softwareFormBuilder.addFormItem(new FormItem(constants.kernelFeatures(), kernelFeatures, 0, true)
.withAutoPlacement(), 2, 10);
softwareFormBuilder.addFormItem(new FormItem(constants.vncEncryptionLabel(), vncEncryptionEnabled, 0).withAutoPlacement(), 2, 10);
softwareFormBuilder.addFormItem(new FormItem(constants.fipsEnabledLabel(), fipsEnabled, 0).withAutoPlacement(), 2, 10);
softwareFormBuilder.addFormItem(new FormItem(constants.ovnConfiguredLabel(), ovnConfigured, 0).withAutoPlacement(), 2, 10);
}

Expand Down
1 change: 0 additions & 1 deletion .../webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/ApplicationConstants.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1777,7 +1777,6 @@ notifDoNotDisturbNextLogin=until Next Log In
vncEncryptionEnabled=Enable VNC Encryption
vncEncryptionEnabledHelpMessage=Enabling VNC Encryption will enforce VNC communication over TLS (using X509Vnc VeNCrypt)
vncEncryptionLabel=VNC Encryption
fipsEnabledLabel=FIPS mode enabled
ovnConfiguredLabel=OVN configured
vdsmName=VDSM Name
portSecurityEnabledLabel=Network Port Security
Expand Down