CLOUDSTACK-8324: Fixed config key in multiple places

Author: Jayapal

api/src/com/cloud/vm/UserVmService.java

@@ -55,12 +55,9 @@
 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

engine/api/src/com/cloud/vm/VirtualMachineManager.java

@@ -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";
     }

engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -361,9 +361,6 @@ public void setHostAllocators(final List<HostAllocator> hostAllocators) {
             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;

server/src/com/cloud/vm/UserVmManagerImpl.java

@@ -3517,7 +3517,7 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
                 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 String getConfigComponentName() {
 
     @Override
     public ConfigKey<?>[] getConfigKeys() {
-        return new ConfigKey<?>[] {EnableDynamicallyScaleVm, VmIpFetchWaitInterval, VmIpFetchTrialMax, VmIpFetchThreadPoolMax, VmConfigDriveLabel};
+        return new ConfigKey<?>[] {EnableDynamicallyScaleVm, VmIpFetchWaitInterval, VmIpFetchTrialMax, VmIpFetchThreadPoolMax};
     }
 
     @Override