openstack/glance
Code Issues Proposed changes

Merge "Remove references of s3 store driver"

Browse Source
This commit is contained in:
Jenkins 2016-08-19 19:11:05 +00:00 committed by Gerrit Code Review
commit 9de8fc1eae
13 changed files with 71 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/architecture.rst
View File

@ -57,7 +57,7 @@ but are not extensively tested upstream.
exclusively makes use of each of the storage systems in the
Supported Storages block. Within the Supported Storages block,
there exist the following storage systems, none of which make use
of anything else: Filesystem, Swift, S3, Ceph, "ellipses", Sheepdog.
of anything else: Filesystem, Swift, Ceph, "ellipses", Sheepdog.
A complete list is given by the currently available drivers in
glance_store/_drivers.

131
doc/source/configuring.rst
View File

@ -119,9 +119,8 @@ An example usage would be:
$ ls /etc/glance/glance-api.d
00-core.conf
01-s3.conf
02-swift.conf
03-ssl.conf
01-swift.conf
02-ssl.conf
... etc.
The numeric prefixes in the example above are only necessary if a specific
@ -419,7 +418,7 @@ Optional. Default: ``file``
Can only be specified in configuration files.
Sets the storage backend to use by default when storing images in Glance.
Available options for this option are (``file``, ``swift``, ``s3``, ``rbd``,
Available options for this option are (``file``, ``swift``, ``rbd``,
``sheepdog``, ``cinder`` or ``vsphere``). In order to select a default store
it must also be listed in the ``stores`` list described below.
@ -428,7 +427,7 @@ it must also be listed in the ``stores`` list described below.
Optional. Default: ``file, http``
A comma separated list of enabled glance stores. Some available options for
this option are (``filesystem``, ``http``, ``rbd``, ``s3``, ``swift``,
this option are (``filesystem``, ``http``, ``rbd``, ``swift``,
``sheepdog``, ``cinder``, ``vmware_datastore``)
Configuring the Filesystem Storage Backend
@ -870,128 +869,6 @@ In the reference, a user can specify the following parameters:
`This option can be specified if ``auth_version`` is ``3``. `
Configuring the S3 Storage Backend
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* ``s3_store_host=URL``
Required when using the S3 storage backend.
Can only be specified in configuration files.
`This option is specific to the S3 storage backend.`
Default: s3.amazonaws.com
Sets the main service URL supplied to S3 when making calls to its storage
system. For more information about the S3 authentication system, please
see the `S3 documentation <http://aws.amazon.com/documentation/s3/>`_
* ``s3_store_access_key=ACCESS_KEY``
Required when using the S3 storage backend.
Can only be specified in configuration files.
`This option is specific to the S3 storage backend.`
Sets the access key to authenticate against the ``s3_store_host`` with.
You should set this to your 20-character Amazon AWS access key.
* ``s3_store_secret_key=SECRET_KEY``
Required when using the S3 storage backend.
Can only be specified in configuration files.
`This option is specific to the S3 storage backend.`
Sets the secret key to authenticate against the
``s3_store_host`` with for the access key ``s3_store_access_key``.
You should set this to your 40-character Amazon AWS secret key.
* ``s3_store_bucket=BUCKET``
Required when using the S3 storage backend.
Can only be specified in configuration files.
`This option is specific to the S3 storage backend.`
Sets the name of the bucket to use for Glance images in S3.
Note that the namespace for S3 buckets is **global**,
therefore you must use a name for the bucket that is unique. It
is recommended that you use a combination of your AWS access key,
**lowercased** with "glance".
For instance if your Amazon AWS access key is:
``ABCDEFGHIJKLMNOPQRST``
then make your bucket value be:
``abcdefghijklmnopqrstglance``
* ``s3_store_create_bucket_on_put``
Optional. Default: ``False``
Can only be specified in configuration files.
`This option is specific to the S3 storage backend.`
If true, Glance will attempt to create the bucket ``s3_store_bucket``
if it does not exist.
* ``s3_store_object_buffer_dir=PATH``
Optional. Default: ``the platform's default temporary directory``
Can only be specified in configuration files.
`This option is specific to the S3 storage backend.`
When sending images to S3, what directory should be
used to buffer the chunks? By default the platform's
temporary directory will be used.
* ``s3_store_large_object_size=SIZE_IN_MB``
Optional. Default: ``100``
Can only be specified in configuration files.
`This option is specific to the S3 storage backend.`
Size, in ``MB``, should S3 start chunking image files
and do a multipart upload in S3.
* ``s3_store_large_object_chunk_size=SIZE_IN_MB``
Optional. Default: ``10``
Can only be specified in configuration files.
`This option is specific to the S3 storage backend.`
Multipart upload part size, in ``MB``, should S3 use
when uploading parts. The size must be greater than or
equal to 5MB. The default is 10MB.
* ``s3_store_thread_pools=NUM``
Optional. Default: ``10``
Can only be specified in configuration files.
`This option is specific to the S3 storage backend.`
The number of thread pools to perform a multipart upload
in S3. The default is 10.
Configuring the RBD Storage Backend
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
doc/source/glanceapi.rst
View File

@ -496,7 +496,7 @@ The list of metadata headers that Glance accepts are listed below.
* ``x-image-meta-store``
This header is optional. Valid values are one of ``file``, ``s3``, ``rbd``,
This header is optional. Valid values are one of ``file``, ``rbd``,
``swift``, ``cinder``, ``sheepdog`` or ``vsphere``.
When present, Glance will attempt to store the disk image data in the

BIN
doc/source/images/architecture.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 47 KiB

121
doc/source/images_src/architecture.graphml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:java="http://www.yworks.com/xml/yfiles-common/1.0/java" xmlns:sys="http://www.yworks.com/xml/yfiles-common/markup/primitives/2.0" xmlns:x="http://www.yworks.com/xml/yfiles-common/markup/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
<!--Created by yEd 3.14.4-->
<!--Created by yEd 3.16.1-->
<key attr.name="Description" attr.type="string" for="graph" id="d0"/>
<key for="port" id="d1" yfiles.type="portgraphics"/>
<key for="port" id="d2" yfiles.type="portgeometry"/>
@ -20,10 +20,10 @@
<y:ProxyAutoBoundsNode>
<y:Realizers active="0">
<y:GroupNode>
<y:Geometry height="85.11637612609246" width="111.74245254504217" x="126.64775665295588" y="85.43888426770397"/>
<y:Geometry height="85.32145425109246" width="111.74245254504217" x="126.64775665295588" y="85.23380614270397"/>
<y:Fill color="#F5F5F5" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="111.74245254504217" x="0.0" y="0.0">Keystone</y:NodeLabel>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="111.74245254504217" x="0.0" y="0.0">Keystone</y:NodeLabel>
<y:Shape type="roundrectangle"/>
<y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
<y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
@ -33,7 +33,7 @@
<y:Geometry height="50.0" width="50.0" x="-50.0" y="-266.5"/>
<y:Fill color="#F5F5F5" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="65.201171875" x="-7.6005859375" y="0.0">Folder 2</y:NodeLabel>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="63.75830078125" x="-6.879150390625" y="0.0">Folder 2</y:NodeLabel>
<y:Shape type="roundrectangle"/>
<y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
<y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
@ -49,7 +49,7 @@
<y:Geometry height="30.0" width="81.74245254504217" x="141.64775665295588" y="121.89982176770397"/>
<y:Fill color="#CFE2F3" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" modelName="custom" textColor="#000000" visible="true" width="22.984375" x="29.379038772521085" y="6.015625">API<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="22.369140625" x="29.686655960021085" y="5.93359375">API<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -68,10 +68,10 @@
<y:ProxyAutoBoundsNode>
<y:Realizers active="0">
<y:GroupNode>
<y:Geometry height="252.54262287806563" width="357.66389457715013" x="258.7215347290039" y="-56.61171875000008"/>
<y:Geometry height="252.74770100306563" width="357.85530082715013" x="258.5301284790039" y="-56.81679687500008"/>
<y:Fill color="#F5F5F5" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="357.66389457715013" x="0.0" y="0.0">Glance</y:NodeLabel>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="357.85530082715013" x="0.0" y="0.0">Glance</y:NodeLabel>
<y:Shape type="roundrectangle"/>
<y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
<y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
@ -81,7 +81,7 @@
<y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
<y:Fill color="#F5F5F5" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="65.201171875" x="-7.6005859375" y="0.0">Folder 3</y:NodeLabel>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="63.75830078125" x="-6.879150390625" y="0.0">Folder 3</y:NodeLabel>
<y:Shape type="roundrectangle"/>
<y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
<y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
@ -97,7 +97,7 @@
<y:Geometry height="83.77634365112692" width="30.0" x="277.0184097290039" y="-18.38009301834442"/>
<y:Fill color="#CFE2F3" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="20.296875" modelName="custom" rotationAngle="270.0" textColor="#000000" visible="true" width="66.6103515625" x="4.8515625" y="8.582996044313461">REST API<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="20.48828125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="62.693359375" x="4.755859375" y="10.541492138063461">REST API<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -114,7 +114,7 @@
<y:Geometry height="57.0" width="48.61853134180035" x="526.3442775726315" y="6.625562401126842"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="20.296875" modelName="custom" textColor="#000000" visible="true" width="77.3359375" x="-14.358703079099882" y="-24.296875">Glance DB<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="20.48828125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="72.5234375" x="-11.952453079099882" y="-24.48828125">Glance DB<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -134,7 +134,7 @@
<y:Geometry height="57.0" width="91.60232162475586" x="504.85238243115384" y="104.31752484326745"/>
<y:Fill color="#CFE2F3" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="52.890625" modelName="custom" textColor="#000000" visible="true" width="84.0966796875" x="3.7528209686279297" y="4.0">Database
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="53.46484375" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="82.0458984375" x="4.77821159362793" y="4.0">Database
Abstraction
Layer<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
@ -153,10 +153,10 @@ Layer<y:LabelModel>
<y:Geometry height="167.70803755785937" width="67.39999999999998" x="357.99770660400395" y="-6.390512714591921"/>
<y:Fill color="#E8EEF7" color2="#B7C9E3" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" backgroundColor="#B7C9E3" configuration="com.yworks.entityRelationship.label.name" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasLineColor="false" height="52.890625" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="73.1728515625" x="-2.8864257812500114" y="4.0">Glance
<y:NodeLabel alignment="center" autoSizePolicy="content" backgroundColor="#B7C9E3" configuration="com.yworks.entityRelationship.label.name" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasLineColor="false" height="53.46484375" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="72.1611328125" x="-2.3805664062500114" y="4.0">Glance
Domain
Controller</y:NodeLabel>
<y:NodeLabel alignment="center" autoSizePolicy="content" borderDistance="5.0" configuration="com.yworks.entityRelationship.label.attributes" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="101.78125" modelName="custom" textColor="#000000" visible="true" width="63.458984375" x="2.0" y="64.890625">Auth
<y:NodeLabel alignment="center" autoSizePolicy="content" borderDistance="5.0" configuration="com.yworks.entityRelationship.label.attributes" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="102.9296875" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="61.5380859375" x="2.0" y="65.46484375">Auth
Notifier
Policy
Quota
@ -180,7 +180,7 @@ DB<y:LabelModel>
<y:Geometry height="87.25366089528723" width="30.0" x="277.0184097290039" y="89.61054401402828"/>
<y:Fill color="#CFE2F3" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="36.59375" modelName="custom" rotationAngle="270.0" textColor="#000000" visible="true" width="84.6435546875" x="-3.296875" y="1.3050531038936128">AuthZ
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="36.9765625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="81.6220703125" x="-3.48828125" y="2.815795291393613">AuthZ
Middleware<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
@ -198,7 +198,7 @@ Middleware<y:LabelModel>
<y:Geometry height="82.38854738860971" width="34.587519999999984" x="458.5772320883177" y="54.38402188052849"/>
<y:Fill color="#CFE2F3" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="36.59375" modelName="custom" rotationAngle="270.0" textColor="#000000" visible="true" width="61.94140625" x="-1.0031149999999798" y="10.223570569304854">Registry
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="36.9765625" horizontalTextPosition="center" iconTextGap="4" modelName="custom" rotationAngle="270.0" textColor="#000000" verticalTextPosition="bottom" visible="true" width="58.8447265625" x="-1.1945212499999798" y="11.771910413054854">Registry
Layer<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
@ -218,10 +218,10 @@ Layer<y:LabelModel>
<y:ProxyAutoBoundsNode>
<y:Realizers active="0">
<y:GroupNode>
<y:Geometry height="87.25366089528723" width="372.7381182861328" x="126.64775665295588" y="203.5500972234542"/>
<y:Geometry height="87.45873902028723" width="372.7381182861328" x="126.64775665295588" y="203.3450190984542"/>
<y:Fill color="#F5F5F5" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="372.7381182861328" x="0.0" y="0.0">Glance Store</y:NodeLabel>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="372.7381182861328" x="0.0" y="0.0">Glance Store</y:NodeLabel>
<y:Shape type="roundrectangle"/>
<y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
<y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
@ -231,7 +231,7 @@ Layer<y:LabelModel>
<y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
<y:Fill color="#F5F5F5" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="65.201171875" x="-7.6005859375" y="0.0">Folder 4</y:NodeLabel>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="63.75830078125" x="-6.879150390625" y="0.0">Folder 4</y:NodeLabel>
<y:Shape type="roundrectangle"/>
<y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
<y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
@ -247,7 +247,7 @@ Layer<y:LabelModel>
<y:Geometry height="30.0" width="221.13579666137696" x="263.25007827771174" y="244.47042478540806"/>
<y:Fill color="#CFE2F3" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="20.296875" modelName="custom" textColor="#000000" visible="true" width="149.0859375" x="36.02492958068848" y="4.8515625">Glance Store Drivers<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="14" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="20.48828125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="141.4912109375" x="39.82229286193848" y="4.755859375">Glance Store Drivers<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -264,7 +264,7 @@ Layer<y:LabelModel>
<y:Geometry height="30.0" width="91.60232162475586" x="141.64775665295588" y="244.470424785408"/>
<y:Fill color="#CFE2F3" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" modelName="custom" textColor="#000000" visible="true" width="41.1015625" x="25.25037956237793" y="6.015625">AuthN<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="40.52734375" x="25.53748893737793" y="5.93359375">AuthN<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -283,10 +283,10 @@ Layer<y:LabelModel>
<y:ProxyAutoBoundsNode>
<y:Realizers active="0">
<y:GroupNode>
<y:Geometry height="120.31768417358398" width="482.44128799438477" x="126.64775665295588" y="313.3428206187414"/>
<y:Geometry height="120.68682479858398" width="479.27136611938477" x="128.34697540295588" y="313.1377424937414"/>
<y:Fill color="#F5F5F5" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="482.44128799438477" x="0.0" y="0.0">Supported Storages</y:NodeLabel>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="479.27136611938477" x="0.0" y="0.0">Supported Storages</y:NodeLabel>
<y:Shape type="roundrectangle"/>
<y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
<y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
@ -296,7 +296,7 @@ Layer<y:LabelModel>
<y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
<y:Fill color="#F5F5F5" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="65.201171875" x="-7.6005859375" y="0.0">Folder 5</y:NodeLabel>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="63.75830078125" x="-6.879150390625" y="0.0">Folder 5</y:NodeLabel>
<y:Shape type="roundrectangle"/>
<y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
<y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
@ -309,10 +309,10 @@ Layer<y:LabelModel>
<node id="n3::n0">
<data key="d6">
<y:SVGNode>
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="233.28872497570978" y="349.8037581187414"/>
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="255.053350792055" y="349.8037581187414"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" modelName="custom" textColor="#000000" visible="true" width="33.6953125" x="2.915843963623047" y="50.887996673583984">Swift<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="32.078125" x="3.724437713623047" y="50.887996673583984">Swift<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -329,10 +329,10 @@ Layer<y:LabelModel>
<node id="n3::n1">
<data key="d6">
<y:SVGNode>
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="310.52522476208674" y="349.8037581187414"/>
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="444.8588745118426" y="349.8037581187414"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" modelName="custom" textColor="#000000" visible="true" width="19.251953125" x="10.137523651123047" y="50.887996673583984">S3<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="33.98828125" x="2.769359588623047" y="50.887996673583984">Ceph<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -349,10 +349,10 @@ Layer<y:LabelModel>
<node id="n3::n2">
<data key="d6">
<y:SVGNode>
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="387.7617245484637" y="349.8037581187414"/>
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="542.2347241212176" y="349.8037581187414"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" modelName="custom" textColor="#000000" visible="true" width="34.984375" x="2.271312713623047" y="50.887996673583984">Ceph<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="61.240234375" x="-10.856616973876953" y="50.887996673583984">Sheepdog<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -369,10 +369,10 @@ Layer<y:LabelModel>
<node id="n3::n3">
<data key="d6">
<y:SVGNode>
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="542.2347241212176" y="349.8037581187414"/>
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="354.05447639477717" y="349.8037581187414"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" modelName="custom" textColor="#000000" visible="true" width="64.181640625" x="-12.327320098876953" y="50.887996673583984">Sheepdog<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="15.390625" x="12.068187713623047" y="50.887996673583984">...<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -387,32 +387,12 @@ Layer<y:LabelModel>
</data>
</node>
<node id="n3::n4">
<data key="d6">
<y:SVGNode>
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="464.99822433484064" y="349.8037581187414"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" modelName="custom" textColor="#000000" visible="true" width="15.443359375" x="12.041820526123047" y="50.887996673583984">...<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
<y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="-0.5" nodeRatioX="0.0" nodeRatioY="0.5" offsetX="0.0" offsetY="4.0" upX="0.0" upY="-1.0"/>
</y:ModelParameter>
</y:NodeLabel>
<y:SVGNodeProperties usingVisualBounds="true"/>
<y:SVGModel svgBoundsPolicy="0">
<y:SVGContent refid="2"/>
</y:SVGModel>
</y:SVGNode>
</data>
</node>
<node id="n3::n5">
<data key="d6">
<y:SVGNode>
<y:Geometry height="46.887996673583984" width="39.527000427246094" x="156.05222518933283" y="349.8037581187414"/>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" modelName="custom" textColor="#000000" visible="true" width="68.3359375" x="-14.404468536376953" y="50.887996673583984">Filesystem<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="64.9375" x="-12.705249786376953" y="50.887996673583984">Filesystem<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -434,10 +414,10 @@ Layer<y:LabelModel>
<y:ProxyAutoBoundsNode>
<y:Realizers active="0">
<y:GroupNode>
<y:Geometry height="82.38854738860971" width="116.67238708489901" x="126.64775665295588" y="-56.61171875000008"/>
<y:Geometry height="82.59362551360971" width="116.67238708489901" x="126.64775665295588" y="-56.81679687500008"/>
<y:Fill color="#F5F5F5" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="116.67238708489901" x="0.0" y="0.0">A client</y:NodeLabel>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="116.67238708489901" x="0.0" y="0.0">A client</y:NodeLabel>
<y:Shape type="roundrectangle"/>
<y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
<y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
@ -447,7 +427,7 @@ Layer<y:LabelModel>
<y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
<y:Fill color="#F5F5F5" transparent="false"/>
<y:BorderStyle color="#000000" type="dashed" width="1.0"/>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.4609375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="65.201171875" x="-7.6005859375" y="0.0">Folder 7</y:NodeLabel>
<y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="21.666015625" horizontalTextPosition="center" iconTextGap="4" modelName="internal" modelPosition="t" textColor="#000000" verticalTextPosition="bottom" visible="true" width="63.75830078125" x="-6.879150390625" y="0.0">Folder 7</y:NodeLabel>
<y:Shape type="roundrectangle"/>
<y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
<y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
@ -463,7 +443,7 @@ Layer<y:LabelModel>
<y:Geometry height="23.599999999999994" width="73.04232162475586" x="145.99782211309903" y="-20.15078125000008"/>
<y:Fill color="#CFE2F3" transparent="false"/>
<y:BorderStyle color="#000000" type="line" width="1.0"/>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="17.96875" modelName="custom" textColor="#000000" visible="true" width="41.1015625" x="15.970379562377929" y="2.815624999999997">AuthN<y:LabelModel>
<y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.1328125" horizontalTextPosition="center" iconTextGap="4" modelName="custom" textColor="#000000" verticalTextPosition="bottom" visible="true" width="40.52734375" x="16.25748893737793" y="2.733593749999997">AuthN<y:LabelModel>
<y:SmartNodeLabelModel distance="4.0"/>
</y:LabelModel>
<y:ModelParameter>
@ -506,7 +486,7 @@ Layer<y:LabelModel>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e3" source="n2::n0" target="n3::n2">
<edge id="e3" source="n2::n0" target="n3::n3">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@ -516,17 +496,7 @@ Layer<y:LabelModel>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e4" source="n2::n0" target="n3::n4">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
<y:LineStyle color="#000000" type="line" width="1.0"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e5" source="n2::n0" target="n3::n3">
<edge id="e4" source="n2::n0" target="n3::n2">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@ -546,7 +516,7 @@ Layer<y:LabelModel>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e6" source="n1" target="n1::n3">
<edge id="e5" source="n1" target="n1::n3">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-112.55865812122867" sy="-30.426253688481314" tx="-11.222289489306997" ty="-60.26124827714441"/>
@ -556,7 +526,7 @@ Layer<y:LabelModel>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e7" source="n1" target="n1::n2">
<edge id="e6" source="n1" target="n1::n2">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-45.40152409183127" sy="82.03123343692525" tx="0.0" ty="0.0"/>
@ -576,7 +546,7 @@ Layer<y:LabelModel>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e8" source="n1::n4" target="n0::n0">
<edge id="e7" source="n1::n4" target="n0::n0">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-2.606716302420523" sy="3.662447306032078" tx="40.885760959262484" ty="0.0"/>
@ -586,7 +556,7 @@ Layer<y:LabelModel>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e9" source="n1::n3" target="n2::n0">
<edge id="e8" source="n1::n3" target="n2::n0">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-33.69779049576158" sy="56.756894670177246" tx="-35.51082494315817" ty="-4.970424785408056">
@ -643,7 +613,7 @@ Layer<y:LabelModel>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e10" source="n2::n1" target="n0::n0">
<edge id="e9" source="n2::n1" target="n0::n0">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="-4.929934539856845" sy="-15.002176922503736" tx="0.0" ty="0.0"/>
@ -653,7 +623,7 @@ Layer<y:LabelModel>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e11" source="n2::n0" target="n3::n5">
<edge id="e10" source="n2::n0" target="n3::n4">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@ -663,7 +633,7 @@ Layer<y:LabelModel>
</y:PolyLineEdge>
</data>
</edge>
<edge id="e12" source="n4::n0" target="n0::n0">
<edge id="e11" source="n4::n0" target="n0::n0">
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
@ -674,7 +644,6 @@ Layer<y:LabelModel>
</data>
</edge>
<edge id="n1::e5" source="n1::n0" target="n1::n4">
<data key="d9"/>
<data key="d10">
<y:PolyLineEdge>
<y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>

2
glance/common/config.py
View File

@ -159,7 +159,7 @@ common_opts = [
'connections.')),
cfg.StrOpt('metadata_encryption_key', secret=True,
help=_('AES key for encrypting store \'location\' metadata. '
'This includes, if used, Swift or S3 credentials. '
'This includes, if used, Swift credentials. '
'Should be set to a random string of length 16, 24 or '
'32 bytes')),
cfg.StrOpt('digest_algorithm', default='sha256',

1
glance/common/location_strategy/store_type.py
View File

@ -57,7 +57,6 @@ def init():
mapping = {'filesystem': ['file', 'filesystem'],
'http': ['http', 'https'],
'rbd': ['rbd'],
's3': ['s3', 's3+http', 's3+https'],
'swift': ['swift', 'swift+https', 'swift+http'],
'sheepdog': ['sheepdog'],
'cinder': ['cinder'],

2
glance/common/store_utils.py
View File

@ -118,7 +118,7 @@ def validate_external_location(uri):
"""
Validate if URI of external location are supported.
Only over non-local store types are OK, i.e. S3, Swift,
Only over non-local store types are OK, i.e. Swift,
HTTP. Note the absence of 'file://' for security reasons,
see LP bug #942118, 1400966, 'swift+config://' is also
absent for security reasons, see LP bug #1334196.

2
glance/tests/functional/store_utils.py
View File

@ -15,7 +15,7 @@
# under the License.
"""
Utility methods to set testcases up for Swift and/or S3 tests.
Utility methods to set testcases up for Swift tests.
"""
from __future__ import print_function

4
glance/tests/unit/common/scripts/test_scripts_utils.py
View File

@ -120,10 +120,6 @@ class TestScriptsUtils(test_utils.BaseTestCase):
self.assertRaises(urllib.error.URLError,
script_utils.validate_location_uri, location)
location = 's3+https://'
self.assertRaises(urllib.error.URLError,
script_utils.validate_location_uri, location)
location = 'rbd://'
self.assertRaises(urllib.error.URLError,
script_utils.validate_location_uri, location)

14
glance/tests/unit/common/test_location_strategy.py
View File

@ -158,11 +158,10 @@ class TestStoreTypeStrategyModule(base.IsolatedUnitTest):
def test_get_ordered_locations(self):
self.config(store_type_preference=[' rbd', 'sheepdog ', ' filesystem',
'swift ', ' http ', 's3'],
'swift ', ' http '],
group='store_type_location_strategy')
locs = [{'url': 'file://image0', 'metadata': {'idx': 3}},
{'url': 'rbd://image1', 'metadata': {'idx': 0}},
{'url': 's3://image2', 'metadata': {'idx': 7}},
{'url': 'file://image3', 'metadata': {'idx': 4}},
{'url': 'swift://image4', 'metadata': {'idx': 6}},
{'url': 'cinder://image5', 'metadata': {'idx': 8}},
@ -176,15 +175,14 @@ class TestStoreTypeStrategyModule(base.IsolatedUnitTest):
def test_get_ordered_locations_with_invalid_store_name(self):
self.config(store_type_preference=[' rbd', 'sheepdog ', 'invalid',
'swift ', ' http ', 's3'],
'swift ', ' http '],
group='store_type_location_strategy')
locs = [{'url': 'file://image0', 'metadata': {'idx': 5}},
locs = [{'url': 'file://image0', 'metadata': {'idx': 4}},
{'url': 'rbd://image1', 'metadata': {'idx': 0}},
{'url': 's3://image2', 'metadata': {'idx': 4}},
{'url': 'file://image3', 'metadata': {'idx': 6}},
{'url': 'file://image3', 'metadata': {'idx': 5}},
{'url': 'swift://image4', 'metadata': {'idx': 3}},
{'url': 'cinder://image5', 'metadata': {'idx': 7}},
{'url': 'file://image6', 'metadata': {'idx': 8}},
{'url': 'cinder://image5', 'metadata': {'idx': 6}},
{'url': 'file://image6', 'metadata': {'idx': 7}},
{'url': 'rbd://image7', 'metadata': {'idx': 1}},
{'url': 'sheepdog://image8', 'metadata': {'idx': 2}}]
ordered_locs = store_type.get_ordered_locations(copy.deepcopy(locs))

1
glance/tests/unit/v2/test_tasks_resource.py
View File

@ -371,7 +371,6 @@ class TestTasksController(test_utils.BaseTestCase):
wrong_import_from = [
"swift://cloud.foo/myaccount/mycontainer/path",
"file:///path",
"s3://accesskey:secretkey@s3.amazonaws.com/bucket/key-id",
"cinder://volume-id"
]
executor_factory = self.gateway.get_task_executor_factory(

11
releasenotes/notes/remove-s3-driver-639c60b71761eb6f.yaml Normal file
View File

@ -0,0 +1,11 @@
---
prelude: >
s3 store driver has been removed.
upgrade:
- The latest release of glance_store library does not
have the support for s3 driver. All code references of
s3 have been removed from the library. As this release
of Glance uses the updated glance_store library, you
will find s3 driver support removed from Glance too.
One such important example is the location strategy
which no longer has s3 support.