From 041303cc6775d6f5c8614f3a6dad2d68d2349371 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Wed, 19 Jun 2013 16:42:24 -0700 Subject: [PATCH] Baremetal: Fix typo of BaremetaUserdataProvider Should be "Baremetal" rather than "Baremeta" --- .../com/cloud/baremetal/networkservice/BaremetalPxeManager.java | 2 +- server/src/com/cloud/network/NetworkServiceImpl.java | 2 +- ui/scripts/zoneWizard.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java index e0a51627fc4..2dd26bc657b 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManager.java @@ -61,5 +61,5 @@ public interface BaremetalPxeManager extends Manager, PluggableService { public static final String BAREMETAL_PXE_CAPABILITY = "BaremetalPxe"; public static final String BAREMETAL_PXE_SERVICE_PROPERTIES = "baremetalpxe_commands.properties"; public static final Provider BAREMETAL_PXE_SERVICE_PROVIDER = new Provider("BaremetalPxeProvider", true);; - public static final Provider BAREMETAL_USERDATA_PROVIDER = new Provider("BaremetaUserdataProvider", true); + public static final Provider BAREMETAL_USERDATA_PROVIDER = new Provider("BaremetalUserdataProvider", true); } diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index c92652d7466..e7de69e8660 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -3778,7 +3778,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalDhcpProvider", null, null); addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalPxeProvider", null, null); - addProviderToPhysicalNetwork(physicalNetworkId, "BaremetaUserdataProvider", null, null); + addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalUserdataProvider", null, null); } return null; } diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index ef8ddbb6b8c..cb92c4e5329 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -24,7 +24,7 @@ var configurationUseLocalStorage = false; var skipGuestTrafficStep = false; var selectedNetworkOfferingObj = {}; - var baremetalProviders = ["BaremetalDhcpProvider", "BaremetalPxeProvider", "BaremetaUserdataProvider"]; + var baremetalProviders = ["BaremetalDhcpProvider", "BaremetalPxeProvider", "BaremetalUserdataProvider"]; var selectedBaremetalProviders = []; // Makes URL string for traffic label