Skip to content

Commit 804e557

Browse files
sdodsleysdodsley
authored
Merge branch 'master' into Victoria
2 parents 0ae469a + d45a509 commit 804e557

File tree

5 files changed

+29
-63
lines changed

5 files changed

+29
-63
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ Table 7.5. Cinder API Overview - Backup
156156

157157

158158
Group API
159-
----------------
159+
---------
160160

161161
Table 7.6, "Cinder API Overview - Group" specifies the valid
162162
operations that can be performed on Cinder groups. Please note that
@@ -225,7 +225,6 @@ display name or UUID.
225225
| Set group specs | ``cinder group-type-key`` | Set or unset group_spec for a group type. |
226226
+-------------------------------------+-----------------------------------+---------------------------------------------------------------------+
227227

228-
229228
Table 7.6. Cinder API Overview - Volume Group
230229

231230

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ 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

5757
.. _table-7.14:
5858

@@ -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 7.14 for optional configuration parameters available
149+
Refer to ":ref:`Table 7.14<table-7.14>`" for optional configuration parameters available
150150
for async replication configuration.

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

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,31 +63,31 @@ There exist three property sets that can be referenced in the
6363

6464
.. _table-7.10:
6565

66-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
67-
| Property | Type | Description |
68-
+=========================================+===========+==============================================================================================================================================================+
69-
| ``host`` | String | The name of the host. |
70-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
71-
| ``volume_backend_name`` | String | Volume backend name as defined in ``cinder.conf`` |
72-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
73-
| ``vendor_name`` | String | The name of the vendor. For FlashArray this is ``Pure Storage`` |
74-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
75-
| ``driver_version`` | String | The Cinder driver version. |
76-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
77-
| ``storage_protocol`` | String | The storage protocol supported. For FlashArray this is either ``iSCSI`` or ``FC``. |
78-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
79-
| ``multiattach_support`` | Boolean | Boolean signifying whether volume multiattach is supported. This is reported as ``True`` for FlashArray. |
80-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
81-
| ``QoS_support`` | Boolean | Boolean signifying whether QoS is supported. This is reported as ``False`` for FlashArray. |
82-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
83-
| ``total_capacity_gb`` | Float | The total capacity of each pool in GB. |
84-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
85-
| ``allocated_capacity_gb`` | Float | The capacity that has been allocated for Cinder volumes on the cluster. This value is reported in GB. |
86-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
87-
| ``free_capacity_gb`` | Float | The amount of free capacity of each pool in GB. |
88-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
89-
| ``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. |
90-
+-----------------------------------------+-----------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
66+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
67+
| Property | Type | Description |
68+
+============================+===========+============================================================================================================================================================+
69+
| ``host`` | String | The name of the host. |
70+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
71+
| ``volume_backend_name`` | String | Volume backend name as defined in ``cinder.conf`` |
72+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
73+
| ``vendor_name`` | String | The name of the vendor. For FlashArray this is ``Pure Storage`` |
74+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
75+
| ``driver_version`` | String | The Cinder driver version. |
76+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
77+
| ``storage_protocol`` | String | The storage protocol supported. For FlashArray this is either ``iSCSI`` or ``FC``. |
78+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
79+
| ``multiattach_support`` | Boolean | Boolean signifying whether volume multiattach is supported. This is reported as ``True`` for FlashArray. |
80+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
81+
| ``QoS_support`` | Boolean | Boolean signifying whether QoS is supported. This is reported as ``True`` for FlashArray. |
82+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
83+
| ``total_capacity_gb`` | Float | The total capacity of each pool in GB. |
84+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
85+
| ``allocated_capacity_gb`` | Float | The capacity that has been allocated for Cinder volumes on the cluster. This value is reported in GB. |
86+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
87+
| ``free_capacity_gb`` | Float | The amount of free capacity of each pool in GB. |
88+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
89+
| ``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. |
90+
+----------------------------+-----------+------------------------------------------------------------------------------------------------------------------------------------------------------------+
9191

9292
Table 7.10 Host statistics
9393

@@ -139,7 +139,6 @@ Table 7.10 Host statistics
139139
| ``metadata`` | General metadata. |
140140
+-----------------------------------------+------------------------------------------------------------------------------------------+
141141

142-
143142
Table 7.11 Volume properties available for Filter and Goodness functions
144143

145144
.. important::

‎source/cinder/examples/openstack_command_line/section_cinder-cli.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ name or UUID.
176176
| {'name': 'volume-648bcd17-e36e-41b3-8087-391544e3b9ac-cinder'} | 1 | False | Volume already managed | 648bcd17-e36e-41b3-8087-391544e3b9ac | - |
177177
| {'name': 'volume-17eb768e-8758-44ff-afc1-45720c1b19f1-cinder'} | 1 | False | Volume already managed | 17eb768e-8758-44ff-afc1-45720c1b19f1 | - |
178178
| {'name': 'manage-me'} | 2 | True | | - | - |
179-
+----------------------------------------------------------------+------+----------------+---------------------------------------------------------------------------+--------------------------------------+------------+
179+
+----------------------------------------------------------------+------+----------------+---------------------------------------------------------------------------+--------------------------------------+------------+
180180

181181
::
182182

‎source/swift/section_swift-ring-considerations.rst‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)