apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source
This commit is contained in:
Edison Su 2012-11-05 11:19:16 -08:00
parent 37197d6360
commit 6dd2318b44
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/storage/src/org/apache/cloudstack/storage/provider/DefaultNfsSecondaryStorageProvider.java
View File

@ -32,8 +32,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreConfigurator; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreConfigurator;
import org.apache.cloudstack.engine.subsystem.api.storage.StorageProvider; import org.apache.cloudstack.engine.subsystem.api.storage.StorageProvider;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore.StoreType; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore.StoreType;
import org.apache.cloudstack.storage.datastoreconfigurator.NfsSecondaryStorageConfigurator;
import org.apache.cloudstack.storage.datastoreconfigurator.XenNfsDataStoreConfigurator;
import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.InvalidParameterValueException;
import com.cloud.hypervisor.Hypervisor; import com.cloud.hypervisor.Hypervisor;
@ -45,7 +43,7 @@ public class DefaultNfsSecondaryStorageProvider implements StorageProvider {
protected Map<HypervisorType, Map<String, DataStoreConfigurator>> _supportedProtocols; protected Map<HypervisorType, Map<String, DataStoreConfigurator>> _supportedProtocols;
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException { public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
Map<String, DataStoreConfigurator> dscs = new HashMap<String, DataStoreConfigurator>(); Map<String, DataStoreConfigurator> dscs = new HashMap<String, DataStoreConfigurator>();
DataStoreConfigurator nfsdc = new NfsSecondaryStorageConfigurator(); DataStoreConfigurator nfsdc = null;
dscs.put(nfsdc.getProtocol(), nfsdc); dscs.put(nfsdc.getProtocol(), nfsdc);
_supportedProtocols.put(HypervisorType.XenServer, dscs); _supportedProtocols.put(HypervisorType.XenServer, dscs);

4
engine/storage/src/org/apache/cloudstack/storage/provider/DefaultPrimaryStorageProvider.java
View File

@ -14,8 +14,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreConfigurator;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreLifeCycle;
import org.apache.cloudstack.engine.subsystem.api.storage.StorageProvider; import org.apache.cloudstack.engine.subsystem.api.storage.StorageProvider;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore.StoreType; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore.StoreType;
import org.apache.cloudstack.storage.datastoreconfigurator.NfsDataStoreConfigurator;
import org.apache.cloudstack.storage.datastoreconfigurator.XenNfsDataStoreConfigurator;
import com.cloud.dc.ClusterVO; import com.cloud.dc.ClusterVO;
import com.cloud.dc.DataCenterVO; import com.cloud.dc.DataCenterVO;
@ -45,7 +43,7 @@ public class DefaultPrimaryStorageProvider implements StorageProvider {
public DefaultPrimaryStorageProvider() { public DefaultPrimaryStorageProvider() {
Map<String, DataStoreConfigurator> dscs = new HashMap<String, DataStoreConfigurator>(); Map<String, DataStoreConfigurator> dscs = new HashMap<String, DataStoreConfigurator>();
DataStoreConfigurator nfsdc = new XenNfsDataStoreConfigurator(); DataStoreConfigurator nfsdc = null;
dscs.put(nfsdc.getProtocol(), nfsdc); dscs.put(nfsdc.getProtocol(), nfsdc);
_supportedProtocols.put(HypervisorType.XenServer, dscs); _supportedProtocols.put(HypervisorType.XenServer, dscs);