summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--openstack-common.conf6
-rw-r--r--os_client_config/tests/test_cloud_config.py3
2 files changed, 1 insertions, 8 deletions
diff --git a/openstack-common.conf b/openstack-common.conf
deleted file mode 100644
index e8eb2aa..0000000
--- a/openstack-common.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-
-# The list of modules to copy from oslo-incubator.git
-
-# The base module to hold the copy of openstack.common
-base=os_client_config \ No newline at end of file
diff --git a/os_client_config/tests/test_cloud_config.py b/os_client_config/tests/test_cloud_config.py
index 01581b1..9d60111 100644
--- a/os_client_config/tests/test_cloud_config.py
+++ b/os_client_config/tests/test_cloud_config.py
@@ -148,8 +148,7 @@ class TestCloudConfig(base.TestCase):
self.assertEqual('volume', cc.get_service_type('volume'))
self.assertEqual('http://compute.example.com',
cc.get_endpoint('compute'))
- self.assertEqual(None,
- cc.get_endpoint('image'))
+ self.assertIsNone(cc.get_endpoint('image'))
self.assertIsNone(cc.get_service_name('compute'))
self.assertEqual('locks', cc.get_service_name('identity'))