diff --git a/admin_manual/configuration_files/external_storage/images/openstack.png b/admin_manual/configuration_files/external_storage/images/openstack.png new file mode 100644 index 000000000..811a4eed9 Binary files /dev/null and b/admin_manual/configuration_files/external_storage/images/openstack.png differ diff --git a/admin_manual/configuration_files/external_storage/images/rackspace.png b/admin_manual/configuration_files/external_storage/images/rackspace.png new file mode 100644 index 000000000..4c46355fc Binary files /dev/null and b/admin_manual/configuration_files/external_storage/images/rackspace.png differ diff --git a/admin_manual/configuration_files/external_storage/openstack.rst b/admin_manual/configuration_files/external_storage/openstack.rst index 83aff5aae..2ebf60995 100644 --- a/admin_manual/configuration_files/external_storage/openstack.rst +++ b/admin_manual/configuration_files/external_storage/openstack.rst @@ -2,21 +2,27 @@ OpenStack Object Storage ======================== -OpenStack Object Storage is used to connect to an OpenStack Swift server. -Two authentication mechanisms are available: one is the generic OpenStack -mechanism, and the other is used exclusively for Rackspace, a provider of object -storage that uses the OpenStack Swift protocol. - -The bucket will be created if it does not exist. +OpenStack Object Storage is used to connect to an OpenStack Swift server, or to +Rackspace. Two authentication mechanisms are available: one is the generic +OpenStack mechanism, and the other is used exclusively for Rackspace, a provider +of object storage that uses the OpenStack Swift protocol. The OpenStack authentication mechanism uses the OpenStack Keystone v2 -protocol, connecting to the server specified in the **URL of Identity -Endpoint** field. You need your **Username**, **Tenant name** and **Password**. +protocol, connecting to the server specified in the **Identity +Endpoint URL** field. You need your **Bucket**, **Username**, **Password** and +**Tenant name**. -The Rackspace authentication mechanism requires a Rackspace **Username** and -**API key**. +.. figure:: images/openstack.png + :alt: Openstack configuration. -It may be necessary to specify a **Service name** or **Region**. The timeout of +The Rackspace authentication mechanism requires a Rackspace +""Bucket**, **Username** and **API key**. You must also enter **cloudFiles** in +the **Service name** field. + +.. figure:: images/rackspace.png + :alt: Openstack configuration. + +It may be necessary to specify a **Region**. The timeout of HTTP requests is set in the **Request timeout** field, in seconds. See :doc:`../external_storage_configuration_gui` for additional mount