Skip to content

Make internaldns1 optional for zone creation #4448

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
ravening wants to merge 1 commit into from
Closed

Make internaldns1 optional for zone creation #4448

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: 1 addition & 1 deletion api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class CreateZoneCmd extends BaseCmd {
@Parameter(name = ApiConstants.GUEST_CIDR_ADDRESS, type = CommandType.STRING, description = "the guest CIDR address for the Zone")
private String guestCidrAddress;

@Parameter(name = ApiConstants.INTERNAL_DNS1, type = CommandType.STRING, required = true, description = "the first internal DNS for the Zone")
@Parameter(name = ApiConstants.INTERNAL_DNS1, type = CommandType.STRING, description = "the first internal DNS for the Zone")
private String internalDns1;

@Parameter(name = ApiConstants.INTERNAL_DNS2, type = CommandType.STRING, description = "the second internal DNS for the Zone")
Expand Down
4 changes: 3 additions & 1 deletion server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,7 +1418,9 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
buf.append(" bootproto=dhcp");
}
DataCenterVO dc = _dcDao.findById(profile.getVirtualMachine().getDataCenterId());
buf.append(" internaldns1=").append(dc.getInternalDns1());
if (dc.getInternalDns1() != null) {
buf.append(" internaldns1=").append(dc.getInternalDns1());
}
if (dc.getInternalDns2() != null) {
buf.append(" internaldns2=").append(dc.getInternalDns2());
}
Expand Down
4 changes: 3 additions & 1 deletion ...ler/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,9 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
}

DataCenterVO dc = _dcDao.findById(profile.getVirtualMachine().getDataCenterId());
buf.append(" internaldns1=").append(dc.getInternalDns1());
if (dc.getInternalDns1() != null) {
buf.append(" internaldns1=").append(dc.getInternalDns1());
}
if (dc.getInternalDns2() != null) {
buf.append(" internaldns2=").append(dc.getInternalDns2());
}
Expand Down
3 changes: 0 additions & 3 deletions ui/scripts/system.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8529,9 +8529,6 @@
internaldns1: {
label: 'label.internal.dns.1',
isEditable: true,
validation: {
required: true
}
},
internaldns2: {
label: 'label.internal.dns.2',
Expand Down
1 change: 0 additions & 1 deletion ui/scripts/zoneWizard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,6 @@
internaldns1: {
label: 'label.internal.dns.1',
validation: {
required: true,
ipv4: true
},
desc: 'message.tooltip.internal.dns.1'
Expand Down