Browse files

Rename keystone.conf to .sample.

Fixes bug 966670.

Change-Id: Ic57c9971c4f3a14c30e2382c58c3d0da6b2a7957
  • Loading branch information...
1 parent 75a8dfe commit f640093ba8afb73b92b026362827611ef015e59d @jk0 jk0 committed Apr 9, 2012
View
1 .gitignore
@@ -19,3 +19,4 @@ ChangeLog
requirements.txt
build/
dist/
+etc/keystone.conf
View
0 etc/keystone.conf → etc/keystone.conf.sample
File renamed without changes.
View
6 keystone/test.py
@@ -131,7 +131,7 @@ def setUp(self):
self.stubs = stubout.StubOutForTesting()
def config(self):
- CONF(config_files=[etcdir('keystone.conf'),
+ CONF(config_files=[etcdir('keystone.conf.sample'),
testsdir('test_overrides.conf')])
def tearDown(self):
@@ -226,8 +226,8 @@ def _paste_config(self, config):
test_path = os.path.join(TESTSDIR, config)
etc_path = os.path.join(ROOTDIR, 'etc', config)
for path in [test_path, etc_path]:
- if os.path.exists('%s.conf' % path):
- return 'config:%s.conf' % path
+ if os.path.exists('%s.conf.sample' % path):
+ return 'config:%s.conf.sample' % path
return config
def loadapp(self, config, name='main'):
View
2 tests/_ldap_livetest.py
@@ -61,7 +61,7 @@ def clear_live_database():
class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
def setUp(self):
super(LDAPIdentity, self).setUp()
- CONF(config_files=[test.etcdir('keystone.conf'),
+ CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_liveldap.conf')])
clear_live_database()
View
2 tests/test_backend_ldap.py
@@ -36,7 +36,7 @@ def clear_database():
class LDAPIdentity(test.TestCase, test_backend.IdentityTests):
def setUp(self):
super(LDAPIdentity, self).setUp()
- CONF(config_files=[test.etcdir('keystone.conf'),
+ CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_ldap.conf')])
clear_database()
View
4 tests/test_backend_sql.py
@@ -30,7 +30,7 @@
class SqlIdentity(test.TestCase, test_backend.IdentityTests):
def setUp(self):
super(SqlIdentity, self).setUp()
- CONF(config_files=[test.etcdir('keystone.conf'),
+ CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_sql.conf')])
sql_util.setup_test_database()
@@ -52,7 +52,7 @@ def test_delete_user_with_tenant_association(self):
class SqlToken(test.TestCase, test_backend.TokenTests):
def setUp(self):
super(SqlToken, self).setUp()
- CONF(config_files=[test.etcdir('keystone.conf'),
+ CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_sql.conf')])
sql_util.setup_test_database()
View
2 tests/test_import_legacy.py
@@ -33,7 +33,7 @@
class ImportLegacy(test.TestCase):
def setUp(self):
super(ImportLegacy, self).setUp()
- CONF(config_files=[test.etcdir('keystone.conf'),
+ CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_sql.conf')])
sql_util.setup_test_database()
View
2 tests/test_keystoneclient_sql.py
@@ -28,7 +28,7 @@
class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase):
def config(self):
- CONF(config_files=[test.etcdir('keystone.conf'),
+ CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_sql.conf')])
sql_util.setup_test_database()
View
2 tests/test_migrate_nova_auth.py
@@ -68,7 +68,7 @@
class MigrateNovaAuth(test.TestCase):
def setUp(self):
super(MigrateNovaAuth, self).setUp()
- CONF(config_files=[test.etcdir('keystone.conf'),
+ CONF(config_files=[test.etcdir('keystone.conf.sample'),
test.testsdir('test_overrides.conf'),
test.testsdir('backend_sql.conf')])
sql_util.setup_test_database()

0 comments on commit f640093

Please sign in to comment.