etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8324: Fixed config key in multiple places

This commit is contained in:
Jayapal 2015-07-02 09:56:58 +05:30
parent 14d53634a8
commit 140cd7c227
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/com/cloud/vm/UserVmService.java
View File

@ -55,12 +55,9 @@ import com.cloud.template.VirtualMachineTemplate;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
import com.cloud.utils.exception.ExecutionException;
import org.apache.cloudstack.framework.config.ConfigKey;
public interface UserVmService {
static final ConfigKey<String> VmConfigDriveLabel = new ConfigKey<String>("Hidden", String.class, "vm.configdrive.label", "config",
"The default lable name for the config drive", false);
/**
* Destroys one virtual machine

3
engine/api/src/com/cloud/vm/VirtualMachineManager.java
View File

@ -52,6 +52,9 @@ public interface VirtualMachineManager extends Manager {
"If set to true, StartCommand, StopCommand, CopyCommand, MigrateCommand will be synchronized on the agent side."
+ " If set to false, these commands become asynchronous. Default value is false.", false);
static final ConfigKey<String> VmConfigDriveLabel = new ConfigKey<String>("Hidden", String.class, "vm.configdrive.label", "config",
"The default lable name for the config drive", false);
public interface Topics {
public static final String VM_POWER_STATE = "vm.powerstate";
}

3
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
View File

@ -361,9 +361,6 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
Integer.class, "vm.job.report.interval", "60",
"Interval to send application level pings to make sure the connection is still working", false);
static final ConfigKey<String> VmConfigDriveLabel = new ConfigKey<String>("Hidden", String.class, "vm.configdrive.label", "config",
"The default lable name for the config drive", false);
ScheduledExecutorService _executor = null;
protected long _nodeId;

4
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -3517,7 +3517,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
String configDriveIsoRootFolder = "/tmp";
String isoFile = configDriveIsoRootFolder + "/" + vmName + "/configDrive/" + vmName + ".iso";
profile.setVmData(vmData);
profile.setConfigDriveLabel(VmConfigDriveLabel.value());
profile.setConfigDriveLabel(VirtualMachineManager.VmConfigDriveLabel.value());
profile.setConfigDriveIsoRootFolder(configDriveIsoRootFolder);
profile.setConfigDriveIsoFile(isoFile);
}
@ -5292,7 +5292,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
@Override
public ConfigKey<?>[] getConfigKeys() {
return new ConfigKey<?>[] {EnableDynamicallyScaleVm, VmIpFetchWaitInterval, VmIpFetchTrialMax, VmIpFetchThreadPoolMax, VmConfigDriveLabel};
return new ConfigKey<?>[] {EnableDynamicallyScaleVm, VmIpFetchWaitInterval, VmIpFetchTrialMax, VmIpFetchThreadPoolMax};
}
@Override