Skip to content

Commit 0ae469a

Browse files
committed
Update table and figure numbers
1 parent 4980249 commit 0ae469a

File tree

9 files changed

+84
-47
lines changed

9 files changed

+84
-47
lines changed

source/ch_swift.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Object Storage Service (Swift)
55
:maxdepth: 1
66

77
swift/section_swift-overview.rst
8+
swift/section_swift-flasharray.rst
89
swift/section_swift-disk-pools.rst
910
swift/section_swift-partitioning.rst
10-
swift/section_swift-ring-considerations.rst
1111

1212
OpenStack Object Storage provides a fully distributed, scale-out,
1313
API-accessible storage platform that can be integrated directly into

source/cinder/api_overview/section_cinder-api-overview.rst

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Reference. <http://docs.openstack.org/icehouse/config-reference/content/config_o
1919
Volume API
2020
----------
2121

22-
Table 4.2, “Cinder API Overview - Volume” specifies the valid
22+
Table 7.2, “Cinder API Overview - Volume” specifies the valid
2323
operations that can be performed on Cinder volumes. Please note that
2424
Cinder volumes are identified as CLI command arguments by either their
2525
names or UUID.
2626

27-
.. _table-4.2:
27+
.. _table-7.2:
2828

2929
+--------------------+-------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
3030
| Operation | CLI Command | Description |
@@ -52,17 +52,17 @@ names or UUID.
5252
| Revert to snapshot | ``cinder revert-to-snapshot`` | Restore a Cinder volume to the state and data of the most recent snapshot. This command is only available in microversion 3.40 and above. |
5353
+--------------------+-------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------+
5454

55-
Table 4.2. Cinder API Overview - Volume
55+
Table 7.2. Cinder API Overview - Volume
5656

5757
Snapshot API
5858
------------
5959

60-
Table 4.3, “Cinder API Overview - Snapshot” specifies the valid
60+
Table 7.3, “Cinder API Overview - Snapshot” specifies the valid
6161
operations that can be performed on Cinder snapshots. Please note that
6262
Cinder snapshots are identified as CLI command arguments by either their
6363
display name or UUID.
6464

65-
.. _table-4.3:
65+
.. _table-7.3:
6666

6767
+---------------+-----------------------------------+--------------------------------------------------------+
6868
| Operation | CLI Command | Description |
@@ -82,12 +82,12 @@ display name or UUID.
8282
| Show | ``cinder snapshot-show`` | Show details about a Cinder snapshot |
8383
+---------------+-----------------------------------+--------------------------------------------------------+
8484

85-
Table 4.3. Cinder API Overview - Snapshot
85+
Table 7.3. Cinder API Overview - Snapshot
8686

8787
Consistency Group API
8888
---------------------
8989

90-
Table 4.4, “Cinder API Overview - Consistency Groups” specifies the
90+
Table 7.4, “Cinder API Overview - Consistency Groups” specifies the
9191
valid operations that can be performed on Cinder consistency groups.
9292
Please note that Cinder consistency groups and cgsnapshots are
9393
identified as CLI command arguments by either their display name or
@@ -96,7 +96,7 @@ Block Storage V3 API. Only Block Storage V2 API supports consistency
9696
groups. Future releases will involve a migration of existing
9797
consistency group operations to use generic volume group operations.
9898

99-
.. _table-4.4:
99+
.. _table-7.4:
100100

101101
+-----------------------------------------------------------------------------+------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
102102
| Operation | CLI Command | Description |
@@ -126,17 +126,17 @@ consistency group operations to use generic volume group operations.
126126
| Create a consistency group from a source consistency group | ``cinder consisgroup-create-from-src`` | Copy a consistency group |
127127
+-----------------------------------------------------------------------------+------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
128128

129-
Table 4.4. Cinder API Overview - Consistency Groups
129+
Table 7.4. Cinder API Overview - Consistency Groups
130130

131131
Backup API
132132
----------
133133

134-
Table 4.5, “Cinder API Overview - Backup” specifies the valid
134+
Table 7.5, “Cinder API Overview - Backup” specifies the valid
135135
operations that can be performed on Cinder backups. Please note that
136136
Cinder backups are identified as CLI command arguments by either their
137137
display name or UUID.
138138

139-
.. _table-4.5:
139+
.. _table-7.5:
140140

141141
+-------------+-----------------------------+------------------------------------------------+
142142
| Operation | CLI Command | Description |
@@ -152,13 +152,13 @@ display name or UUID.
152152
| Show | ``cinder backup-show`` | Show details about a Cinder backup |
153153
+-------------+-----------------------------+------------------------------------------------+
154154

155-
Table 4.5. Cinder API Overview - Backup
155+
Table 7.5. Cinder API Overview - Backup
156156

157157

158158
Group API
159159
----------------
160160

161-
Table 4.6, "Cinder API Overview - Group" specifies the valid
161+
Table 7.6, "Cinder API Overview - Group" specifies the valid
162162
operations that can be performed on Cinder groups. Please note that
163163
Cinder groups are identified as CLI command arguments by either their
164164
display name or UUID.
@@ -183,7 +183,7 @@ display name or UUID.
183183
of each Cinder volume in the group. To enable consistency group snapshots set
184184
``consistent_group_snapshot_enabled="<is> True"`` in the group type used.
185185

186-
.. _table-4.6:
186+
.. _table-7.6:
187187

188188
+-------------------------------------+-----------------------------------+---------------------------------------------------------------------+
189189
| Operation | CLI Command | Description |
@@ -226,18 +226,18 @@ display name or UUID.
226226
+-------------------------------------+-----------------------------------+---------------------------------------------------------------------+
227227

228228

229-
Table 4.6. Cinder API Overview - Volume Group
229+
Table 7.6. Cinder API Overview - Volume Group
230230

231231

232232
Volume Type API
233233
---------------
234234

235-
Table 4.7, “Cinder API Overview - Volume Type” specifies the valid
235+
Table 7.7, “Cinder API Overview - Volume Type” specifies the valid
236236
operations that can be performed on Cinder volume types. Please note
237237
that Cinder volume types are identified as CLI command arguments by
238238
either their display name or UUID.
239239

240-
.. _table-4.7:
240+
.. _table-7.7:
241241

242242
+-------------+--------------------------+------------------------------------+
243243
| Operation | CLI Command | Description |
@@ -249,17 +249,17 @@ either their display name or UUID.
249249
| List | ``cinder type-list`` | List existing Cinder volume type |
250250
+-------------+--------------------------+------------------------------------+
251251

252-
Table 4.7. Cinder API Overview - Volume Type
252+
Table 7.7. Cinder API Overview - Volume Type
253253

254254
Volume Type Extra Specs API
255255
---------------------------
256256

257-
Table 4.8, “Cinder API Overview - Volume Type Extra Specs” specifies
257+
Table 7.8, “Cinder API Overview - Volume Type Extra Specs” specifies
258258
the valid operations that can be performed on Cinder volume type extra
259259
specs. Please note that Cinder volume type extra specs are properties of
260260
Cinder volume types and are identified by their parent object.
261261

262-
.. _table-4.8:
262+
.. _table-7.8:
263263

264264
+---------------------+-----------------------------------+----------------------------------------------+
265265
| Operation | CLI Command | Description |
@@ -269,18 +269,18 @@ Cinder volume types and are identified by their parent object.
269269
| Unset extra specs | ``cinder type-key vtype unset`` | Remove extra specs from Cinder volume type |
270270
+---------------------+-----------------------------------+----------------------------------------------+
271271

272-
Table 4.8. Cinder API Overview - Volume Type Extra Specs
272+
Table 7.8. Cinder API Overview - Volume Type Extra Specs
273273

274274
Volume Type QoS Specs API
275275
-------------------------
276276

277-
Table 4.9, “Cinder API Overview - Volume Type QoS Specs” specifies the
277+
Table 7.9, “Cinder API Overview - Volume Type QoS Specs” specifies the
278278
valid operations that can be performed on Cinder volume type QoS specs.
279279
Please note that Cinder volume type QoS specs are created independently
280280
of Cinder volume types and are subsequently associated with a Cinder
281281
volume type.
282282

283-
.. _table-4.9:
283+
.. _table-7.9:
284284

285285
+--------------------------+-------------------------------+------------------------------------------------------------+
286286
| Operation | CLI Command | Description |
@@ -300,4 +300,4 @@ volume type.
300300
| Edit QoS spec | ``cinder qos-key`` | Set or unset specifications for a Cinder QoS Spec |
301301
+--------------------------+-------------------------------+------------------------------------------------------------+
302302

303-
Table 4.9. Cinder API Overview - Volume Type QoS Specs
303+
Table 7.9. Cinder API Overview - Volume Type QoS Specs

source/cinder/configuration/cinder_config_files/section_flasharray-conf.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ For more information on the configuration and best practices for
1414
specific OpenStack releases please visit
1515
the following link: http://support.purestorage.com/Solutions/OpenStack
1616

17-
Table 4.18 lists the required storage system attributes used in the
17+
Table 7.13 lists the required storage system attributes used in the
1818
``/etc/cinder/cinder.conf`` configuration file.
1919

20-
.. _table-4.18:
20+
.. _table-7.13:
2121

2222
+--------------------------------------+----------------------------+---------------------------------------------+
2323
| FlashArray Attribute | Default | Description |
@@ -27,7 +27,7 @@ Table 4.18 lists the required storage system attributes used in the
2727
| ``pure_api_token`` | None | FlashArray authorization API token |
2828
+--------------------------------------+----------------------------+---------------------------------------------+
2929

30-
Table 4.18. Required FlashArray Attributes
30+
Table 7.13. Required FlashArray Attributes
3131

3232
Add the following lines to the file, replacing login and password with
3333
the cluster admin login credentials
@@ -54,7 +54,7 @@ in the ``[pure]`` section of the ``/etc/cinder/cinder.conf``
5454
configuration file to control the interaction between the storage
5555
system and the OpenStack Cinder service. (See Table 4.19.)
5656

57-
.. _table-4.19:
57+
.. _table-7.14:
5858

5959
+------------------------------------------------------+----------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
6060
| FlashArray Attribute | Default | Description |
@@ -86,7 +86,7 @@ system and the OpenStack Cinder service. (See Table 4.19.)
8686
| ``pure_iscsi_cidr`` | ``0.0.0.0/0`` | CIDR of FlashArray iSCSI targets hosts are allowed to connect to. Default will allow connection to any IPv4 address. |
8787
+------------------------------------------------------+----------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
8888

89-
Table 4.19. Optional FlashArray Attributes
89+
Table 7.14. Optional FlashArray Attributes
9090

9191
FlashArray Replication Setup
9292
----------------------------
@@ -146,5 +146,5 @@ async replication:
146146
$ openstack volume type set --property replication_enabled='<is> True' ReplicationType
147147
$ openstack volume type set --property replication_type='<in> async' ReplicationType
148148
149-
Refer to Table 4.19 for optional configuration parameters available
149+
Refer to Table 7.14 for optional configuration parameters available
150150
for async replication configuration.

source/cinder/deployment_choice/section_driver-filter-weigher.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ There exist three property sets that can be referenced in the
5858
backend. This would be analogous to a FlashArray
5959
system. They can be invoked as ``stats.<property>``.
6060
For example: ``stats.allocated_capacity_gb``.
61-
":ref:`Table 4.12<table-4.12>`" lists the
61+
":ref:`Table 7.10<table-7.10>`" lists the
6262
host stats that can be used for FlashArray systems.
6363

64-
.. _table-4.12:
64+
.. _table-7.10:
6565

6666
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
6767
| Property | Type | Description |
@@ -89,17 +89,17 @@ There exist three property sets that can be referenced in the
8989
| ``reserved_percentage`` | Float | The reserved percentage for each pool. This specifies how much space is to be reduced from total_capacity when performing over subscription calculations. |
9090
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
9191

92-
Table 4.12 Host statistics
92+
Table 7.10 Host statistics
9393

9494
- **Requested volume properties**: These statistics are used
9595
to control scheduling based on the specifications
9696
of the volume requested during creation. These parameters
9797
can be referenced as ``volume.<property>``. For example,
9898
the size of the requested volume is returned by ``volume.size``.
99-
":ref:`Table 4.13<table-4.13>`" contains a list of statistics
99+
":ref:`Table 7.11<table-7.11>`" contains a list of statistics
100100
that can be queried from a volume request.
101101

102-
.. _table-4.13:
102+
.. _table-7.11:
103103

104104
+-----------------------------------------+------------------------------------------------------------------------------------------+
105105
| Property | Description |
@@ -140,7 +140,7 @@ Table 4.12 Host statistics
140140
+-----------------------------------------+------------------------------------------------------------------------------------------+
141141

142142

143-
Table 4.13 Volume properties available for Filter and Goodness functions
143+
Table 7.11 Volume properties available for Filter and Goodness functions
144144

145145
.. important::
146146

@@ -151,7 +151,7 @@ Table 4.13 Volume properties available for Filter and Goodness functions
151151
- **Backend specific capabilities**: The following table
152152
contains a list of capabilities reported by the FlashArray Cinder driver.
153153

154-
.. _table-4.14:
154+
.. _table-7.12:
155155

156156
+-----------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------+
157157
| Property | Type | Description |
@@ -185,7 +185,7 @@ Table 4.13 Volume properties available for Filter and Goodness functions
185185
| ``queue_depth`` | String | Current queue depth for the array. |
186186
+-----------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------+
187187

188-
Table 4.14 Backend capabilities reported by FlashArray Cinder drivers
188+
Table 7.12 Backend capabilities reported by FlashArray Cinder drivers
189189

190190
Configuration
191191
-------------

source/cinder/overview/section_cinder-overview.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ solution for block storage provisioning and lifecycle management.
2626
.. figure:: ../../images/cinder_nova_architecture.png
2727
:alt: Cinder and Nova Logical Architecture
2828

29-
Figure 4.1. Cinder and Nova Logical Architecture
29+
Figure 7.1. Cinder and Nova Logical Architecture

source/cinder/process_structure/section_cinder-processes.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ There are four processes that make up the Cinder service:
2828
:alt: Cinder Processes Concept Diagram
2929
:scale: 80
3030

31-
Figure 4.2. Cinder Processes Concept Diagram
31+
Figure 7.2. Cinder Processes Concept Diagram
3232

3333
Volume Creation Workflow
3434
------------------------
@@ -39,7 +39,7 @@ requests the creation of a new volume from Cinder.
3939
.. figure:: ../../images/cinder_create_volume_process.png
4040
:alt: Cinder Workflow - Volume Creation
4141

42-
Figure 4.3. Cinder Workflow - Volume Creation
42+
Figure 7.3. Cinder Workflow - Volume Creation
4343

4444
1. Client issues request to create volume through invoking REST API
4545
(client may use ``python-cinderclient`` CLI utility).
@@ -80,7 +80,7 @@ requests that a Cinder volume be attached to a Nova compute instance.
8080
.. figure:: ../../images/nova_volume_attach_process.png
8181
:alt: Cinder & Nova Workflow - Volume Attach
8282

83-
Figure 4.4. Cinder & Nova Workflow - Volume Attach
83+
Figure 7.4. Cinder & Nova Workflow - Volume Attach
8484

8585
1. Client issues request to attach volume through invoking Nova REST API
8686
(client may use ``python-novaclient`` CLI utility).
@@ -121,7 +121,7 @@ requests that a Cinder volume be backed up.
121121
.. figure:: ../../images/cinder_backup_process.png
122122
:alt: Cinder Backup Workflow
123123

124-
Figure 4.5. Cinder Backup Workflow
124+
Figure 7.5. Cinder Backup Workflow
125125

126126
1. Client issues request to backup a Cinder volume by invoking REST API
127127
(client may use ``python-cinderclient`` CLI utility).
@@ -163,7 +163,7 @@ requests that a Cinder backup be restored.
163163
.. figure:: ../../images/cinder_backup_process.png
164164
:alt: Cinder Restore Workflow
165165

166-
Figure 4.6. Cinder Restore Workflow
166+
Figure 7.6. Cinder Restore Workflow
167167

168168
1. Client issues request to restore a Cinder volume by invoking REST API
169169
(client may use ``python-cinderclient`` CLI utility).

source/glance/ch_glance-configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ of Glance Image Cache for Cinder with FlashArray for iSCSI or Fibre Channel:
2222
| 6 | Verify functionality | |
2323
+-----+-------------------------------------------------------+---------+
2424

25-
Table 5.2: Checklist of Steps for Enhanced Instance Creation
25+
Table 5.1: Checklist of Steps for Enhanced Instance Creation
2626

2727
|
2828

0 commit comments

Comments
 (0)