openstack/openstack-manuals
Code Issues Proposed changes

Fix code samples.

Browse Source 
Change-Id: Ida5bac2de469694f05e37b8afc0995b7f58122c7
Partial-Bug: #1285604
This commit is contained in:
Diane Fleming 2015-04-12 18:32:20 -05:00
parent 186bcaf23c
commit 2a8cebde46
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/common/samples/server-scheduler-hints3.json
View File

@ -10,4 +10,4 @@
"8c19174f-4220-44f0-824a-cd1eeef10287" "8c19174f-4220-44f0-824a-cd1eeef10287"
] ]
} }
} }

15
doc/config-reference/block-storage/drivers/netapp-volume-driver.xml
View File

@ -22,12 +22,14 @@
has introduced the concept of "storage pools", in which a single has introduced the concept of "storage pools", in which a single
OpenStack Block Storage back end may present one or more logical OpenStack Block Storage back end may present one or more logical
storage resource pools from which OpenStack Block Storage will storage resource pools from which OpenStack Block Storage will
select as a storage location when provisioning volumes.</para> select as a storage location when provisioning volumes.
</para>
<para>In releases prior to Juno, the NetApp unified driver contained some <para>In releases prior to Juno, the NetApp unified driver contained some
"scheduling" logic that determined which NetApp storage container "scheduling" logic that determined which NetApp storage container
(namely, a FlexVol volume for Data ONTAP, or a dynamic disk pool for (namely, a FlexVol volume for Data ONTAP, or a dynamic disk pool for
E-Series) that a new OpenStack Block Storage volume would be E-Series) that a new OpenStack Block Storage volume would be
placed into.</para> placed into.
</para>
<para>With the introduction of pools, all scheduling logic <para>With the introduction of pools, all scheduling logic
is performed completely within the OpenStack Block Storage scheduler, is performed completely within the OpenStack Block Storage scheduler,
as each NetApp storage container is directly exposed to the OpenStack 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 NetApp unified driver presented an aggregated view to the scheduler
and made a final placement decision as to which NetApp storage and made a final placement decision as to which NetApp storage
container the OpenStack Block Storage volume would be provisioned container the OpenStack Block Storage volume would be provisioned
into.</para> into.
</para>
</note> </note>
<section xml:id="ontap-cluster-family"> <section xml:id="ontap-cluster-family">
<title>NetApp clustered Data ONTAP storage family</title> <title>NetApp clustered Data ONTAP storage family</title>
@ -221,9 +224,9 @@ nfs_shares_config = <replaceable>/etc/cinder/nfs_shares</replaceable></programli
correct information about the NFS export correct information about the NFS export
used by the Image Service, similar used by the Image Service, similar
to:</para> to:</para>
<programlisting language="ini">{ <programlisting language="JSON">{
"share_location": "<replaceable>nfs://192.168.0.1/myGlanceExport</replaceable>", "share_location": "nfs://192.168.0.1/myGlanceExport",
"mount_point": "<replaceable>/var/lib/glance/images</replaceable>", "mount_point": "/var/lib/glance/images",
"type": "nfs" "type": "nfs"
}</programlisting> }</programlisting>
</listitem> </listitem>