Skip to content

Commit d45a509

Browse files
sdodsleysdodsley
committed
Initial Commit
1 parent 992490f commit d45a509

File tree

12 files changed

+198
-206
lines changed

12 files changed

+198
-206
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: 25 additions & 26 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
159-
----------------
159+
---------
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 |
@@ -225,19 +225,18 @@ display name or UUID.
225225
| Set group specs | ``cinder group-type-key`` | Set or unset group_spec for a group type. |
226226
+-------------------------------------+-----------------------------------+---------------------------------------------------------------------+
227227

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

231230

232231
Volume Type API
233232
---------------
234233

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

240-
.. _table-4.7:
239+
.. _table-7.7:
241240

242241
+-------------+--------------------------+------------------------------------+
243242
| Operation | CLI Command | Description |
@@ -249,17 +248,17 @@ either their display name or UUID.
249248
| List | ``cinder type-list`` | List existing Cinder volume type |
250249
+-------------+--------------------------+------------------------------------+
251250

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

254253
Volume Type Extra Specs API
255254
---------------------------
256255

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

262-
.. _table-4.8:
261+
.. _table-7.8:
263262

264263
+---------------------+-----------------------------------+----------------------------------------------+
265264
| Operation | CLI Command | Description |
@@ -269,18 +268,18 @@ Cinder volume types and are identified by their parent object.
269268
| Unset extra specs | ``cinder type-key vtype unset`` | Remove extra specs from Cinder volume type |
270269
+---------------------+-----------------------------------+----------------------------------------------+
271270

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

274273
Volume Type QoS Specs API
275274
-------------------------
276275

277-
Table 4.9, “Cinder API Overview - Volume Type QoS Specs” specifies the
276+
Table 7.9, “Cinder API Overview - Volume Type QoS Specs” specifies the
278277
valid operations that can be performed on Cinder volume type QoS specs.
279278
Please note that Cinder volume type QoS specs are created independently
280279
of Cinder volume types and are subsequently associated with a Cinder
281280
volume type.
282281

283-
.. _table-4.9:
282+
.. _table-7.9:
284283

285284
+--------------------------+-------------------------------+------------------------------------------------------------+
286285
| Operation | CLI Command | Description |
@@ -300,4 +299,4 @@ volume type.
300299
| Edit QoS spec | ``cinder qos-key`` | Set or unset specifications for a Cinder QoS Spec |
301300
+--------------------------+-------------------------------+------------------------------------------------------------+
302301

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

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

Lines changed: 11 additions & 7 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
@@ -52,9 +52,9 @@ Optional Cinder Configuration Attributes
5252
You can optionally use the following attributes specific to FlashArray
5353
in the ``[pure]`` section of the ``/etc/cinder/cinder.conf``
5454
configuration file to control the interaction between the storage
55-
system and the OpenStack Cinder service. (See Table 4.19.)
55+
system and the OpenStack Cinder service. (See Table 7.14.)
5656

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

5959
+------------------------------------------------------+----------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
6060
| FlashArray Attribute | Default | Description |
@@ -83,8 +83,12 @@ system and the OpenStack Cinder service. (See Table 4.19.)
8383
+------------------------------------------------------+----------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
8484
| ``pure_replication_pod_name`` | ``cinder-pod`` | Pure Pod name to use for sync replication (will be created if it does not exist). |
8585
+------------------------------------------------------+----------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
86+
| ``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. |
87+
+------------------------------------------------------+----------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
88+
| ``pure_iscsi_cidr_v6`` | ``0:0:0:0:0:0:0:0/0`` | CIDR of FlashArray iSCSI targets hosts are allowed to connect to. Default will allow connection to any IPv6 address. |
89+
+------------------------------------------------------+----------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
8690

87-
Table 4.19. Optional FlashArray Attributes
91+
Table 7.14. Optional FlashArray Attributes
8892

8993
FlashArray Replication Setup
9094
----------------------------
@@ -144,5 +148,5 @@ async replication:
144148
$ openstack volume type set --property replication_enabled='<is> True' ReplicationType
145149
$ openstack volume type set --property replication_type='<in> async' ReplicationType
146150
147-
Refer to Table 4.19 for optional configuration parameters available
151+
Refer to ":ref:`Table 7.14<table-7.14>`" for optional configuration parameters available
148152
for async replication configuration.

0 commit comments

Comments
 (0)