From 920a49cfa055733d575282973e23558c33087a4a Mon Sep 17 00:00:00 2001 From: RHE Date: Fri, 24 Nov 2017 13:54:26 +0100 Subject: remove keystone-moon Change-Id: I80d7c9b669f19d5f6607e162de8e0e55c2f80fdd Signed-off-by: RHE --- .../tests/unit/config_files/backend_db2.conf | 4 --- .../tests/unit/config_files/backend_ldap.conf | 5 --- .../tests/unit/config_files/backend_ldap_pool.conf | 41 ---------------------- .../tests/unit/config_files/backend_ldap_sql.conf | 14 -------- .../tests/unit/config_files/backend_liveldap.conf | 10 ------ .../unit/config_files/backend_multi_ldap_sql.conf | 9 ----- .../tests/unit/config_files/backend_mysql.conf | 4 --- .../unit/config_files/backend_pool_liveldap.conf | 32 ----------------- .../unit/config_files/backend_postgresql.conf | 4 --- .../tests/unit/config_files/backend_sql.conf | 8 ----- .../unit/config_files/backend_tls_liveldap.conf | 14 -------- .../tests/unit/config_files/deprecated.conf | 8 ----- .../unit/config_files/deprecated_override.conf | 15 -------- .../keystone.domain1.conf | 5 --- .../keystone.Default.conf | 14 -------- .../keystone.domain1.conf | 12 ------- .../keystone.domain2.conf | 13 ------- .../keystone.domain2.conf | 5 --- .../keystone.Default.conf | 14 -------- .../keystone.domain1.conf | 5 --- .../tests/unit/config_files/test_auth_plugin.conf | 4 --- 21 files changed, 240 deletions(-) delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_db2.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_ldap.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_ldap_pool.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_ldap_sql.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_liveldap.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_multi_ldap_sql.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_mysql.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_pool_liveldap.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_postgresql.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_sql.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/backend_tls_liveldap.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/deprecated.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/deprecated_override.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/domain_configs_default_ldap_one_sql/keystone.domain1.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.Default.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain1.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain2.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/domain_configs_one_extra_sql/keystone.domain2.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.Default.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.domain1.conf delete mode 100644 keystone-moon/keystone/tests/unit/config_files/test_auth_plugin.conf (limited to 'keystone-moon/keystone/tests/unit/config_files') diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_db2.conf b/keystone-moon/keystone/tests/unit/config_files/backend_db2.conf deleted file mode 100644 index 2bd0c1a6..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_db2.conf +++ /dev/null @@ -1,4 +0,0 @@ -#Used for running the Migrate tests against a live DB2 Server -#See _sql_livetest.py -[database] -connection = ibm_db_sa://keystone:keystone@/staktest?charset=utf8 diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_ldap.conf b/keystone-moon/keystone/tests/unit/config_files/backend_ldap.conf deleted file mode 100644 index 32161185..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_ldap.conf +++ /dev/null @@ -1,5 +0,0 @@ -[ldap] -url = fake://memory -user = cn=Admin -password = password -suffix = cn=example,cn=com diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_ldap_pool.conf b/keystone-moon/keystone/tests/unit/config_files/backend_ldap_pool.conf deleted file mode 100644 index 36fa1ac9..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_ldap_pool.conf +++ /dev/null @@ -1,41 +0,0 @@ -[ldap] -url = fakepool://memory -user = cn=Admin -password = password -backend_entities = ['Tenant', 'User', 'UserRoleAssociation', 'Role', 'Group', 'Domain'] -suffix = cn=example,cn=com - -# Connection pooling specific attributes - -# Enable LDAP connection pooling. (boolean value) -use_pool=true - -# Connection pool size. (integer value) -pool_size=5 - -# Maximum count of reconnect trials. (integer value) -pool_retry_max=2 - -# Time span in seconds to wait between two reconnect trials. -# (floating point value) -pool_retry_delay=0.2 - -# Connector timeout in seconds. Value -1 indicates indefinite -# wait for response. (integer value) -pool_connection_timeout=-1 - -# Connection lifetime in seconds. -# (integer value) -pool_connection_lifetime=600 - -# Enable LDAP connection pooling for end user authentication. -# If use_pool is disabled, then this setting is meaningless -# and is not used at all. (boolean value) -use_auth_pool=true - -# End user auth connection pool size. (integer value) -auth_pool_size=50 - -# End user auth connection lifetime in seconds. (integer -# value) -auth_pool_connection_lifetime=60 \ No newline at end of file diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_ldap_sql.conf b/keystone-moon/keystone/tests/unit/config_files/backend_ldap_sql.conf deleted file mode 100644 index 96a0ffa9..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_ldap_sql.conf +++ /dev/null @@ -1,14 +0,0 @@ -[database] -#For a specific location file based SQLite use: -#connection = sqlite:////tmp/keystone.db -#To Test MySQL: -#connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8 -#To Test PostgreSQL: -#connection = postgresql://keystone:keystone@localhost/keystone?client_encoding=utf8 -idle_timeout = 200 - -[ldap] -url = fake://memory -user = cn=Admin -password = password -suffix = cn=example,cn=com diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_liveldap.conf b/keystone-moon/keystone/tests/unit/config_files/backend_liveldap.conf deleted file mode 100644 index bb9ee08f..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_liveldap.conf +++ /dev/null @@ -1,10 +0,0 @@ -[ldap] -url = ldap://localhost -user = cn=Manager,dc=openstack,dc=org -password = test -suffix = dc=openstack,dc=org -group_tree_dn = ou=UserGroups,dc=openstack,dc=org -user_tree_dn = ou=Users,dc=openstack,dc=org -user_enabled_emulation = True -user_mail_attribute = mail -use_dumb_member = True diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_multi_ldap_sql.conf b/keystone-moon/keystone/tests/unit/config_files/backend_multi_ldap_sql.conf deleted file mode 100644 index 5185770b..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_multi_ldap_sql.conf +++ /dev/null @@ -1,9 +0,0 @@ -[database] -connection = sqlite:// -#For a file based sqlite use -#connection = sqlite:////tmp/keystone.db -#To Test MySQL: -#connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8 -#To Test PostgreSQL: -#connection = postgresql://keystone:keystone@localhost/keystone?client_encoding=utf8 -idle_timeout = 200 diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_mysql.conf b/keystone-moon/keystone/tests/unit/config_files/backend_mysql.conf deleted file mode 100644 index 2495f036..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_mysql.conf +++ /dev/null @@ -1,4 +0,0 @@ -#Used for running the Migrate tests against a live MySQL Server -#See _sql_livetest.py -[database] -connection = mysql+pymysql://keystone:keystone@localhost/keystone_test?charset=utf8 diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_pool_liveldap.conf b/keystone-moon/keystone/tests/unit/config_files/backend_pool_liveldap.conf deleted file mode 100644 index c36e05f9..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_pool_liveldap.conf +++ /dev/null @@ -1,32 +0,0 @@ -[ldap] -url = ldap://localhost -user = cn=Manager,dc=openstack,dc=org -password = test -suffix = dc=openstack,dc=org -group_tree_dn = ou=UserGroups,dc=openstack,dc=org -user_tree_dn = ou=Users,dc=openstack,dc=org -user_enabled_emulation = True -user_mail_attribute = mail -use_dumb_member = True - -# Connection pooling specific attributes - -# Enable LDAP connection pooling. (boolean value) -use_pool=true -# Connection pool size. (integer value) -pool_size=5 -# Connection lifetime in seconds. -# (integer value) -pool_connection_lifetime=60 - -# Enable LDAP connection pooling for end user authentication. -# If use_pool is disabled, then this setting is meaningless -# and is not used at all. (boolean value) -use_auth_pool=true - -# End user auth connection pool size. (integer value) -auth_pool_size=50 - -# End user auth connection lifetime in seconds. (integer -# value) -auth_pool_connection_lifetime=300 \ No newline at end of file diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_postgresql.conf b/keystone-moon/keystone/tests/unit/config_files/backend_postgresql.conf deleted file mode 100644 index 001805df..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_postgresql.conf +++ /dev/null @@ -1,4 +0,0 @@ -#Used for running the Migrate tests against a live Postgresql Server -#See _sql_livetest.py -[database] -connection = postgresql://keystone:keystone@localhost/keystone_test?client_encoding=utf8 diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_sql.conf b/keystone-moon/keystone/tests/unit/config_files/backend_sql.conf deleted file mode 100644 index f2828e2e..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_sql.conf +++ /dev/null @@ -1,8 +0,0 @@ -[database] -#For a specific location file based SQLite use: -#connection = sqlite:////tmp/keystone.db -#To Test MySQL: -#connection = mysql+pymysql://keystone:keystone@localhost/keystone?charset=utf8 -#To Test PostgreSQL: -#connection = postgresql://keystone:keystone@localhost/keystone?client_encoding=utf8 -idle_timeout = 200 diff --git a/keystone-moon/keystone/tests/unit/config_files/backend_tls_liveldap.conf b/keystone-moon/keystone/tests/unit/config_files/backend_tls_liveldap.conf deleted file mode 100644 index b66044b7..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/backend_tls_liveldap.conf +++ /dev/null @@ -1,14 +0,0 @@ -[ldap] -url = ldap:// -user = dc=Manager,dc=openstack,dc=org -password = test -suffix = dc=openstack,dc=org -group_tree_dn = ou=UserGroups,dc=openstack,dc=org -user_tree_dn = ou=Users,dc=openstack,dc=org -user_enabled_emulation = True -user_mail_attribute = mail -use_dumb_member = True -use_tls = True -tls_cacertfile = /etc/keystone/ssl/certs/cacert.pem -tls_cacertdir = /etc/keystone/ssl/certs/ -tls_req_cert = demand diff --git a/keystone-moon/keystone/tests/unit/config_files/deprecated.conf b/keystone-moon/keystone/tests/unit/config_files/deprecated.conf deleted file mode 100644 index 515e663a..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/deprecated.conf +++ /dev/null @@ -1,8 +0,0 @@ -# Options in this file are deprecated. See test_config. - -[sql] -# These options were deprecated in Icehouse with the switch to oslo's -# db.sqlalchemy. - -connection = sqlite://deprecated -idle_timeout = 54321 diff --git a/keystone-moon/keystone/tests/unit/config_files/deprecated_override.conf b/keystone-moon/keystone/tests/unit/config_files/deprecated_override.conf deleted file mode 100644 index 1d1c926f..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/deprecated_override.conf +++ /dev/null @@ -1,15 +0,0 @@ -# Options in this file are deprecated. See test_config. - -[sql] -# These options were deprecated in Icehouse with the switch to oslo's -# db.sqlalchemy. - -connection = sqlite://deprecated -idle_timeout = 54321 - - -[database] -# These are the new options from the [sql] section. - -connection = sqlite://new -idle_timeout = 65432 diff --git a/keystone-moon/keystone/tests/unit/config_files/domain_configs_default_ldap_one_sql/keystone.domain1.conf b/keystone-moon/keystone/tests/unit/config_files/domain_configs_default_ldap_one_sql/keystone.domain1.conf deleted file mode 100644 index fecc7bea..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/domain_configs_default_ldap_one_sql/keystone.domain1.conf +++ /dev/null @@ -1,5 +0,0 @@ -# The domain-specific configuration file for the test domain -# 'domain1' for use with unit tests. - -[identity] -driver = sql \ No newline at end of file diff --git a/keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.Default.conf b/keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.Default.conf deleted file mode 100644 index 64d01d48..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.Default.conf +++ /dev/null @@ -1,14 +0,0 @@ -# The domain-specific configuration file for the default domain for -# use with unit tests. -# -# The domain_name of the default domain is 'Default', hence the -# strange mix of upper/lower case in the file name. - -[ldap] -url = fake://memory -user = cn=Admin -password = password -suffix = cn=example,cn=com - -[identity] -driver = ldap diff --git a/keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain1.conf b/keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain1.conf deleted file mode 100644 index af540537..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain1.conf +++ /dev/null @@ -1,12 +0,0 @@ -# The domain-specific configuration file for the test domain -# 'domain1' for use with unit tests. - -[ldap] -url = fake://memory1 -user = cn=Admin -password = password -suffix = cn=example,cn=com - -[identity] -driver = ldap -list_limit = 101 diff --git a/keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain2.conf b/keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain2.conf deleted file mode 100644 index a14179e3..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/domain_configs_multi_ldap/keystone.domain2.conf +++ /dev/null @@ -1,13 +0,0 @@ -# The domain-specific configuration file for the test domain -# 'domain2' for use with unit tests. - -[ldap] -url = fake://memory -user = cn=Admin -password = password -suffix = cn=myroot,cn=com -group_tree_dn = ou=UserGroups,dc=myroot,dc=org -user_tree_dn = ou=Users,dc=myroot,dc=org - -[identity] -driver = ldap \ No newline at end of file diff --git a/keystone-moon/keystone/tests/unit/config_files/domain_configs_one_extra_sql/keystone.domain2.conf b/keystone-moon/keystone/tests/unit/config_files/domain_configs_one_extra_sql/keystone.domain2.conf deleted file mode 100644 index 925b26f2..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/domain_configs_one_extra_sql/keystone.domain2.conf +++ /dev/null @@ -1,5 +0,0 @@ -# The domain-specific configuration file for the test domain -# 'domain2' for use with unit tests. - -[identity] -driver = sql \ No newline at end of file diff --git a/keystone-moon/keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.Default.conf b/keystone-moon/keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.Default.conf deleted file mode 100644 index 2dd86c25..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.Default.conf +++ /dev/null @@ -1,14 +0,0 @@ -# The domain-specific configuration file for the default domain for -# use with unit tests. -# -# The domain_name of the default domain is 'Default', hence the -# strange mix of upper/lower case in the file name. - -[ldap] -url = fake://memory -user = cn=Admin -password = password -suffix = cn=example,cn=com - -[identity] -driver = ldap \ No newline at end of file diff --git a/keystone-moon/keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.domain1.conf b/keystone-moon/keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.domain1.conf deleted file mode 100644 index fecc7bea..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/domain_configs_one_sql_one_ldap/keystone.domain1.conf +++ /dev/null @@ -1,5 +0,0 @@ -# The domain-specific configuration file for the test domain -# 'domain1' for use with unit tests. - -[identity] -driver = sql \ No newline at end of file diff --git a/keystone-moon/keystone/tests/unit/config_files/test_auth_plugin.conf b/keystone-moon/keystone/tests/unit/config_files/test_auth_plugin.conf deleted file mode 100644 index 4a9e87d5..00000000 --- a/keystone-moon/keystone/tests/unit/config_files/test_auth_plugin.conf +++ /dev/null @@ -1,4 +0,0 @@ -[auth] -methods = external,password,token,simple_challenge_response,saml2,openid,x509 -simple_challenge_response = keystone.tests.unit.test_auth_plugin.SimpleChallengeResponse - -- cgit 1.2.3-korg