| commit | dccaf684bc9e02ce26ec0f2a7dad02f740ad4c46 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Thu Jan 08 12:40:14 2015 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Thu Jan 08 12:40:14 2015 +0000 |
| tree | 5152f3ee621e65b45bfe0433a1cd154967c26573 | |
| parent | cd3622e3e2dd815db08cb2b0543bc9c0f51d2dfb [diff] | |
| parent | c6b2562ce6edcc15fa47a29288cf95ffee5258d9 [diff] |
Merge "Cleanup heat/openstack/common"
diff --git a/common/config.py b/common/config.py index 71fabe1..562b80b 100644 --- a/common/config.py +++ b/common/config.py
@@ -11,7 +11,6 @@ # under the License. import os -import sys from oslo.config import cfg @@ -108,7 +107,5 @@ return conf -if __name__ == '__main__': - cfg.CONF = init_conf(False) - import heat.openstack.common.config.generator as generate - generate.generate(sys.argv[1:]) +def list_opts(): + yield None, IntegrationTestGroup