Move console scripts to entrypoints.

As part of the move of plugins to entrypoints, take advantage of the
entrypoints based console scripts, which will make our command line scripts
available for unittesting.

Part of blueprint entrypoints-plugins

Co-authored-by: Michael Still <mikal@stillhq.com>

Change-Id: I5f17348b7b3cc896c92263dd518abb128757d81f

1 files changed, 14 insertions, 57 deletions

diff --git a/bin/nova-api b/bin/nova-api
index 171a23ea0..4620dfc21 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -1,65 +1,22 @@
 #!/usr/bin/env python
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-#        http://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-"""Starter script for Nova API.
+# Temporary shim to do a devstack transition
+from nova.cmd import api
 
-Starts both the EC2 and OpenStack APIs in separate greenthreads.
-
-"""
-
-import eventlet
-eventlet.monkey_patch(os=False)
-
-import gettext
-import os
-import sys
-
-from oslo.config import cfg
-
-possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
-        sys.argv[0]), os.pardir, os.pardir))
-if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
-    sys.path.insert(0, possible_topdir)
-
-gettext.install('nova', unicode=1)
-
-from nova import config
-from nova.openstack.common import log as logging
-from nova import service
-from nova import utils
-
-CONF = cfg.CONF
-CONF.import_opt('enabled_apis', 'nova.service')
-CONF.import_opt('enabled_ssl_apis', 'nova.service')
-
-if __name__ == '__main__':
-    config.parse_args(sys.argv)
-    logging.setup("nova")
-    utils.monkey_patch()
-
-    launcher = service.ProcessLauncher()
-    for api in CONF.enabled_apis:
-        should_use_ssl = api in CONF.enabled_ssl_apis
-        if api == 'ec2':
-            server = service.WSGIService(api, use_ssl=should_use_ssl,
-                                         max_url_len=16384)
-        else:
-            server = service.WSGIService(api, use_ssl=should_use_ssl)
-        launcher.launch_server(server, workers=server.workers or 1)
-    launcher.wait()
+api.main()