Merge "Uncomment all removed Cinder drivers"

This commit is contained in:
Jenkins
2015-03-21 10:11:27 +00:00
committed by Gerrit Code Review
2 changed files with 23 additions and 12 deletions

View File

@@ -56,4 +56,9 @@
<xi:include href="../../common/tables/cinder-srb.xml"/>
<xi:include href="../../common/tables/cinder-violin.xml"/>
<!-- The following drivers have been removed from the kilo
release, leave them in for now since they might get added for
liberty if a reported CI gets setup.
<xi:include href="../../common/tables/cinder-drbd.xml"/>
-->
</section>

View File

@@ -16,29 +16,22 @@
<programlisting>volume_driver = cinder.volume.drivers.lvm.LVMISCSIDriver</programlisting>
<!-- Keep this list alphabetically sorted. -->
<xi:include href="drivers/ceph-rbd-volume-driver.xml"/>
<xi:include href="drivers/coraid-driver.xml"/>
<xi:include href="drivers/dell-equallogic-driver.xml"/>
<xi:include href="drivers/dell-storagecenter-driver.xml"/>
<xi:include href="drivers/emc-vmax-driver.xml"/>
<xi:include href="drivers/emc-vnx-direct-driver.xml"/>
<xi:include href="drivers/emc-xtremio-driver.xml"/>
<xi:include href="drivers/fujitsu-dx-volume-driver.xml"/>
<xi:include href="drivers/fusionio-volume-driver.xml"/>
<xi:include href="drivers/glusterfs-driver.xml"/>
<xi:include href="drivers/hds-hnas-driver.xml"/>
<xi:include href="drivers/hds-hus-driver.xml"/>
<xi:include href="drivers/hitachi-storage-volume-driver.xml"/>
<xi:include href="drivers/hp-3par-driver.xml"/>
<xi:include href="drivers/hp-lefthand-driver.xml"/>
<xi:include href="drivers/hp-msa-driver.xml"/>
<xi:include href="drivers/huawei-storage-driver.xml"/>
<xi:include href="drivers/ibm-gpfs-volume-driver.xml"/>
<xi:include href="drivers/ibm-storwize-svc-driver.xml"/>
<xi:include href="drivers/ibm-xiv-volume-driver.xml"/>
<xi:include href="drivers/ibm-flashsystem-volume-driver.xml"/>
<xi:include href="drivers/lvm-volume-driver.xml"/>
<xi:include href="drivers/netapp-volume-driver.xml"/>
<xi:include href="drivers/nexenta-volume-driver.xml"/>
<xi:include href="drivers/nimble-volume-driver.xml"/>
<xi:include href="drivers/nfs-volume-driver.xml"/>
<xi:include href="drivers/prophetstor-dpl-driver.xml"/>
@@ -47,12 +40,25 @@
<xi:include href="drivers/sheepdog-driver.xml"/>
<xi:include href="drivers/smbfs-volume-driver.xml"/>
<xi:include href="drivers/solidfire-volume-driver.xml"/>
<xi:include href="drivers/storpool-driver.xml"/>
<xi:include href="drivers/vmware-vmdk-driver.xml"/>
<xi:include href="drivers/windows-iscsi-volume-driver.xml"/>
<xi:include href="drivers/xen-sm-driver.xml"/>
<xi:include href="drivers/xenapi-nfs.xml"/>
<xi:include href="drivers/zadara-volume-driver.xml"/>
<xi:include href="drivers/zfssa-nfs-driver.xml"/>
<xi:include href="drivers/zfssa-volume-driver.xml"/>
<!-- The following drivers have been removed from the kilo
release, leave them in for now since they might get added for
liberty if a reported CI gets setup.
<xi:include href="drivers/fujitsu-dx-volume-driver.xml"/>
<xi:include href="drivers/fusionio-volume-driver.xml"/>
<xi:include href="drivers/huawei-storage-driver.xml"/>
<xi:include href="drivers/nexenta-volume-driver.xml"/>
<xi:include href="drivers/storpool-driver.xml"/>
<xi:include href="drivers/windows-iscsi-volume-driver.xml"/>
<xi:include href="drivers/zadara-volume-driver.xml"/>
<xi:include href="drivers/netapp-volume-driver.xml"/>
<xi:include href="drivers/zfssa-nfs-driver.xml"/>
<xi:include href="drivers/zfssa-volume-driver.xml"/>
<xi:include href="drivers/hp-msa-driver.xml"/>
<xi:include href="drivers/coraid-driver.xml"/>
-->
</section>