Skip to content

network: ConfigDrive must check Dhcp/Dns on the network, not on itself #132

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

Open
msinhore wants to merge 1 commit into
base: main
Choose a base branch
from
Open

network: ConfigDrive must check Dhcp/Dns on the network, not on itself #132

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
13 changes: 11 additions & 2 deletions server/src/main/java/com/cloud/network/element/ConfigDriveNetworkElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,13 +631,22 @@ private Map<Long, List<Network.Service>> getSupportedServicesByElementForNetwork
Map<Long, List<Network.Service>> supportedServices = new HashMap<>();
for (NicProfile nic: nics) {
ArrayList<Network.Service> serviceList = new ArrayList<>();
if (_networkModel.isProviderSupportServiceInNetwork(nic.getNetworkId(), Service.Dns, getProvider())) {
// Dhcp / Dns are checked against the network as a whole rather than against the
// ConfigDrive provider itself. Their actual provider on a modern offering can be
// a different element entirely (Ovn / Netris / Nsx / VirtualRouter ...), but the
// information cloud-init needs in network_data.json — link MTU, expected IPv4,
// gateway, DNS servers — must still be emitted on the ConfigDrive ISO. Without
// this, network_data.json is written as `{}` and Ubuntu 24.04 / cloud-init >= 23
// does not bring any interface up at boot, even though hostname / SSH keys (read
// from meta_data.json) are correctly applied. UserData stays scoped to ConfigDrive
// because that one IS provided by this element directly.
if (_networkModel.areServicesSupportedInNetwork(nic.getNetworkId(), Service.Dns)) {
serviceList.add(Service.Dns);
}
if (_networkModel.isProviderSupportServiceInNetwork(nic.getNetworkId(), Service.UserData, getProvider())) {
serviceList.add(Service.UserData);
}
if (_networkModel.isProviderSupportServiceInNetwork(nic.getNetworkId(), Service.Dhcp, getProvider())) {
if (_networkModel.areServicesSupportedInNetwork(nic.getNetworkId(), Service.Dhcp)) {
serviceList.add(Service.Dhcp);
}
supportedServices.put(nic.getId(), serviceList);
Expand Down