From: Steven Hardy Date: Thu, 31 Jan 2013 15:41:16 +0000 (+0000) Subject: heat api : add register_api_opts to init.py X-Git-Tag: 2014.1~947 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2979270a41ae2a3fb28e37900e93dd174a16f6e6;p=openstack-build%2Fheat-build.git heat api : add register_api_opts to init.py Add register_api_opts to api/__init__.py, slightly simplifying the api executables, and also solving an issue with some tests which were not working via nosetests -s due to the required options not being registered in cfg.CONF Change-Id: I70b16aae1f73f72518013dbcda37defa79fc5649 Signed-off-by: Steven Hardy --- diff --git a/bin/heat-api b/bin/heat-api index 85462643..52162876 100755 --- a/bin/heat-api +++ b/bin/heat-api @@ -46,7 +46,6 @@ if __name__ == '__main__': try: cfg.CONF(project='heat', prog='heat-api') config.setup_logging() - config.register_api_opts() app = config.load_paste_app() diff --git a/bin/heat-api-cfn b/bin/heat-api-cfn index 58ef0371..81f8fa54 100755 --- a/bin/heat-api-cfn +++ b/bin/heat-api-cfn @@ -48,7 +48,6 @@ if __name__ == '__main__': try: cfg.CONF(project='heat', prog='heat-api-cfn') config.setup_logging() - config.register_api_opts() app = config.load_paste_app() diff --git a/bin/heat-api-cloudwatch b/bin/heat-api-cloudwatch index 2437abe8..edb98ebe 100755 --- a/bin/heat-api-cloudwatch +++ b/bin/heat-api-cloudwatch @@ -48,7 +48,6 @@ if __name__ == '__main__': try: cfg.CONF(project='heat', prog='heat-api-cloudwatch') config.setup_logging() - config.register_api_opts() app = config.load_paste_app() diff --git a/heat/api/__init__.py b/heat/api/__init__.py index e8e40359..de94140f 100644 --- a/heat/api/__init__.py +++ b/heat/api/__init__.py @@ -12,3 +12,7 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. + +from heat.common import config + +config.register_api_opts()