Resolve conflicts and merge trunk

1 files changed, 34 insertions, 0 deletions

diff --git a/bin/nova-api-new b/bin/nova-api-new
new file mode 100755
index 000000000..fda42339c
--- /dev/null
+++ b/bin/nova-api-new
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+# pylint: disable-msg=C0103
+# 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.
+#
+#    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
+#
+#    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.
+"""
+Nova API daemon.
+"""
+
+from nova import api
+from nova import flags
+from nova import utils
+from nova import wsgi
+
+FLAGS = flags.FLAGS
+flags.DEFINE_integer('api_port', 8773, 'API port')
+
+if __name__ == '__main__':
+    utils.default_flagfile()
+    wsgi.run_server(api.API(), FLAGS.api_port)