diff --git a/doc/common/samples/server-scheduler-hints3.json b/doc/common/samples/server-scheduler-hints3.json
index 16006603c0..85a2b1e776 100644
--- a/doc/common/samples/server-scheduler-hints3.json
+++ b/doc/common/samples/server-scheduler-hints3.json
@@ -10,4 +10,4 @@
"8c19174f-4220-44f0-824a-cd1eeef10287"
]
}
-}
\ No newline at end of file
+}
diff --git a/doc/config-reference/block-storage/drivers/netapp-volume-driver.xml b/doc/config-reference/block-storage/drivers/netapp-volume-driver.xml
index 2f753173b5..1d8d90e6ab 100644
--- a/doc/config-reference/block-storage/drivers/netapp-volume-driver.xml
+++ b/doc/config-reference/block-storage/drivers/netapp-volume-driver.xml
@@ -22,12 +22,14 @@
has introduced the concept of "storage pools", in which a single
OpenStack Block Storage back end may present one or more logical
storage resource pools from which OpenStack Block Storage will
- select as a storage location when provisioning volumes.
+ select as a storage location when provisioning volumes.
+
In releases prior to Juno, the NetApp unified driver contained some
"scheduling" logic that determined which NetApp storage container
(namely, a FlexVol volume for Data ONTAP, or a dynamic disk pool for
E-Series) that a new OpenStack Block Storage volume would be
- placed into.
+ placed into.
+
With the introduction of pools, all scheduling logic
is performed completely within the OpenStack Block Storage scheduler,
as each NetApp storage container is directly exposed to the OpenStack
@@ -35,7 +37,8 @@
NetApp unified driver presented an aggregated view to the scheduler
and made a final placement decision as to which NetApp storage
container the OpenStack Block Storage volume would be provisioned
- into.
+ into.
+
NetApp clustered Data ONTAP storage family
@@ -221,9 +224,9 @@ nfs_shares_config = /etc/cinder/nfs_shares
- {
- "share_location": "nfs://192.168.0.1/myGlanceExport",
- "mount_point": "/var/lib/glance/images",
+ {
+ "share_location": "nfs://192.168.0.1/myGlanceExport",
+ "mount_point": "/var/lib/glance/images",
"type": "nfs"
}