mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
2dbdc46337
Description: Making SHA256SALT the default encoding algorithm to encode passwords when creating/updating users. Introducing a new configurable list to allow admins to separately configure the order of preference for encoding and authentication schemes. Since passwords are now sent by clients as clear text, fixing the Plain text authenticator to check against the password passed in rather than its md5 digest.
195 lines
6.4 KiB
XML
195 lines
6.4 KiB
XML
|
|
<!--
|
|
Licensed to the Apache Software Foundation (ASF) under one
|
|
or more contributor license agreements. See the NOTICE file
|
|
distributed with this work for additional information
|
|
regarding copyright ownership. The ASF licenses this file
|
|
to you under the Apache License, Version 2.0 (the
|
|
"License"); you may not use this file except in compliance
|
|
with the License. You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing,
|
|
software distributed under the License is distributed on an
|
|
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
KIND, either express or implied. See the License for the
|
|
specific language governing permissions and limitations
|
|
under the License.
|
|
-->
|
|
<beans xmlns="http://www.springframework.org/schema/beans"
|
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
xmlns:context="http://www.springframework.org/schema/context"
|
|
xmlns:tx="http://www.springframework.org/schema/tx"
|
|
xmlns:aop="http://www.springframework.org/schema/aop"
|
|
xsi:schemaLocation="http://www.springframework.org/schema/beans
|
|
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
|
|
http://www.springframework.org/schema/tx
|
|
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
|
|
http://www.springframework.org/schema/aop
|
|
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
|
|
http://www.springframework.org/schema/context
|
|
http://www.springframework.org/schema/context/spring-context-3.0.xsd">
|
|
|
|
<!--
|
|
OSS deployment component configuration
|
|
-->
|
|
<bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" />
|
|
<bean id="configurationDaoImpl" class="com.cloud.configuration.dao.ConfigurationDaoImpl" />
|
|
|
|
<!--
|
|
Managers & pluggable adapters configuration under OSS deployment
|
|
-->
|
|
<bean id="storageManagerImpl" class="com.cloud.storage.StorageManagerImpl">
|
|
<property name="StoragePoolAllocators">
|
|
<list>
|
|
<ref bean="LocalStoragePoolAllocator"/>
|
|
<ref bean="clusterScopeStoragePoolAllocator"/>
|
|
<ref bean="zoneWideStoragePoolAllocator"/>
|
|
<ref bean="garbageCollectingStoragePoolAllocator"/>
|
|
</list>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="FirstFitPlanner" class="com.cloud.deploy.FirstFitPlanner">
|
|
<property name="name" value="First Fit"/>
|
|
<property name="StoragePoolAllocators">
|
|
<list>
|
|
<ref bean="LocalStoragePoolAllocator"/>
|
|
<ref bean="clusterScopeStoragePoolAllocator"/>
|
|
<ref bean="zoneWideStoragePoolAllocator"/>
|
|
<ref bean="garbageCollectingStoragePoolAllocator"/>
|
|
</list>
|
|
</property>
|
|
<property name="HostAllocators">
|
|
<list>
|
|
<ref bean="FirstFitRouting"/>
|
|
</list>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="resourceManagerImpl" class="com.cloud.resource.ResourceManagerImpl" >
|
|
<property name="PodAllocators">
|
|
<list>
|
|
<ref bean="UserConcentratedAllocator"/>
|
|
</list>
|
|
</property>
|
|
<property name="Discoverers">
|
|
<list>
|
|
<ref bean="XcpServerDiscoverer"/>
|
|
<ref bean="SecondaryStorageDiscoverer"/>
|
|
<ref bean="KvmServerDiscoverer"/>
|
|
<ref bean="LxcServerDiscoverer"/>
|
|
|
|
<!--
|
|
<ref bean="BareMetalDiscoverer"/>
|
|
-->
|
|
|
|
<ref bean="OvmDiscoverer"/>
|
|
</list>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="highAvailabilityManagerExtImpl" class="com.cloud.ha.HighAvailabilityManagerExtImpl" >
|
|
<property name="Investigators">
|
|
<list>
|
|
<ref bean="CheckOnAgentInvestigator"/>
|
|
<ref bean="XenServerInvestigator"/>
|
|
<ref bean="UserVmDomRInvestigator"/>
|
|
<ref bean="ManagementIPSystemVMInvestigator"/>
|
|
</list>
|
|
</property>
|
|
<property name="FenceBuilders">
|
|
<list>
|
|
<ref bean="XenServerFencer"/>
|
|
<ref bean="KVMFencer"/>
|
|
<ref bean="OvmFencer"/>
|
|
</list>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="clusteredVirtualMachineManagerImpl" class="com.cloud.vm.ClusteredVirtualMachineManagerImpl" >
|
|
<property name="HostAllocators">
|
|
<list>
|
|
<ref bean="FirstFitRouting"/>
|
|
</list>
|
|
</property>
|
|
<property name="Planners">
|
|
<list>
|
|
<ref bean="FirstFitPlanner" />
|
|
<ref bean="UserDispersingPlanner" />
|
|
<ref bean="UserConcentratedPodPlanner" />
|
|
|
|
<!--
|
|
<ref bean="BareMetalPlanner" />
|
|
-->
|
|
|
|
</list>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="networkManagerImpl" class="com.cloud.network.NetworkManagerImpl" >
|
|
<property name="NetworkGurus">
|
|
<list>
|
|
<ref bean="StorageNetworkGuru"/>
|
|
<ref bean="ExternalGuestNetworkGuru"/>
|
|
<ref bean="PublicNetworkGuru"/>
|
|
<ref bean="PodBasedNetworkGuru"/>
|
|
<ref bean="DirectPodBasedNetworkGuru"/>
|
|
<ref bean="ControlNetworkGuru"/>
|
|
<ref bean="DirectNetworkGuru"/>
|
|
<ref bean="OvsGuestNetworkGuru"/>
|
|
<ref bean="PrivateNetworkGuru"/>
|
|
</list>
|
|
</property>
|
|
<property name="NetworkElements">
|
|
<list>
|
|
<ref bean="VirtualRouter"/>
|
|
<ref bean="Ovs"/>
|
|
<ref bean="SecurityGroupProvider"/>
|
|
<ref bean="VpcVirtualRouter"/>
|
|
<!--
|
|
<ref bean="BareMetalDhcp"/>
|
|
<ref bean="BareMetalPxe"/>
|
|
<ref bean="BareMetalUserdata"/>
|
|
-->
|
|
</list>
|
|
</property>
|
|
<property name="IpDeployers">
|
|
<list>
|
|
<ref bean="elasticLoadBalancerElement"/>
|
|
<ref bean="VirtualRouter"/>
|
|
<ref bean="VpcVirtualRouter"/>
|
|
</list>
|
|
</property>
|
|
<property name="DhcpProviders">
|
|
<list>
|
|
<ref bean="VirtualRouter"/>
|
|
<ref bean="VpcVirtualRouter"/>
|
|
<!--
|
|
<ref bean="BareMetalDhcp"/>
|
|
-->
|
|
</list>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="networkModelImpl" class="com.cloud.network.NetworkModelImpl">
|
|
<property name="NetworkElements">
|
|
<list>
|
|
<ref bean="VirtualRouter"/>
|
|
<ref bean="Ovs"/>
|
|
<ref bean="SecurityGroupProvider"/>
|
|
<ref bean="VpcVirtualRouter"/>
|
|
<!--
|
|
<ref bean="BareMetalDhcp"/>
|
|
<ref bean="BareMetalPxe"/>
|
|
<ref bean="BareMetalUserdata"/>
|
|
-->
|
|
</list>
|
|
</property>
|
|
</bean>
|
|
|
|
<bean id="GlobalLoadBalancingRulesServiceImpl" class ="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" />
|
|
|
|
</beans>
|