Remove unused ec2 driver option

Remove the unused ec2 driver option from the config. This option is unused since the credential backend is used for the ec2 contrib extension. Change-Id: I5385a086210e415a14b0ed1605c9ded50a280ad2
openstack · Oct 13, 2014 · fd57a12 · fd57a12
1 parent b276f3d
commit fd57a12
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 19 deletions.
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
@@ -81,7 +81,6 @@ following sections:
 * ``[cache]`` - Caching layer configuration
 * ``[catalog]`` - Service catalog driver configuration
 * ``[credential]`` - Credential system driver configuration
-* ``[ec2]`` - Amazon EC2 authentication driver configuration
 * ``[endpoint_filter]`` - Endpoint filtering extension configuration
 * ``[endpoint_policy]`` - Endpoint policy extension configuration
 * ``[federation]`` - Federation driver configuration

diff --git a/etc/keystone.conf.sample b/etc/keystone.conf.sample
@@ -714,16 +714,6 @@
 #db_max_retries=20
 
 
-[ec2]
-
-#
-# Options defined in keystone
-#
-
-# EC2Credential backend driver. (string value)
-#driver=keystone.contrib.ec2.backends.kvs.Ec2
-
-
 [endpoint_filter]
 
 #

diff --git a/keystone/common/config.py b/keystone/common/config.py
@@ -472,11 +472,6 @@
                    help='Maximum number of entities that will be returned '
                         'in a policy collection.'),
     ],
-    'ec2': [
-        cfg.StrOpt('driver',
-                   default='keystone.contrib.ec2.backends.kvs.Ec2',
-                   help='EC2Credential backend driver.'),
-    ],
     'endpoint_filter': [
         cfg.StrOpt('driver',
                    default='keystone.contrib.endpoint_filter.backends'

diff --git a/keystone/tests/core.py b/keystone/tests/core.py
@@ -785,9 +785,6 @@ def config_overrides(self):
         self.config_fixture.config(
             group='catalog',
             driver='keystone.catalog.backends.sql.Catalog')
-        self.config_fixture.config(
-            group='ec2',
-            driver='keystone.contrib.ec2.backends.sql.Ec2')
         self.config_fixture.config(
             group='identity',
             driver='keystone.identity.backends.sql.Identity')