From caeece6e3783692dd6af6e3bec092eddb2b3e2fc Mon Sep 17 00:00:00 2001 From: Devin Carlen Date: Wed, 23 Jun 2010 22:04:16 -0700 Subject: Updated licenses --- bin/nova-api | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'bin/nova-api') diff --git a/bin/nova-api b/bin/nova-api index 8fea1da4d..5ea49692c 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -1,19 +1,24 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright [2010] [Anso Labs, LLC] -# -# 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 -# +# Copyright 2010 United States Government as represented by the +# Administrator of the National Aeronautics and Space Administration. +# All Rights Reserved. +# +# Copyright 2010 Anso Labs, LLC +# +# 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. +# 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. + """ Tornado daemon for the main API endpoint. """ -- cgit From 4ba6802ae5d6fb4e0d8ed7bbbaf2cca94a6d1118 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Wed, 23 Jun 2010 23:15:06 -0700 Subject: Removed trailing whitespace from header --- bin/nova-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/nova-api') diff --git a/bin/nova-api b/bin/nova-api index 5ea49692c..e9772ec81 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -2,7 +2,7 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. +# Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # # Copyright 2010 Anso Labs, LLC -- cgit From 849282175c38ec419fc037b1698cb4de4efdb833 Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Fri, 25 Jun 2010 18:55:14 -0400 Subject: Admin API + Worker Tracking. --- bin/nova-api | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'bin/nova-api') diff --git a/bin/nova-api b/bin/nova-api index e9772ec81..f0f79a236 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -20,7 +20,7 @@ # under the License. """ - Tornado daemon for the main API endpoint. +Tornado daemon for the main API endpoint. """ import logging @@ -34,6 +34,7 @@ from nova import rpc from nova import server from nova import utils from nova.auth import users +from nova.compute import model from nova.endpoint import admin from nova.endpoint import api from nova.endpoint import cloud @@ -43,9 +44,10 @@ FLAGS = flags.FLAGS def main(_argv): user_manager = users.UserManager() + host_manager = model.Host controllers = { 'Cloud': cloud.CloudController(), - 'Admin': admin.AdminController(user_manager) + 'Admin': admin.AdminController(user_manager, host_manager) } _app = api.APIServerApplication(user_manager, controllers) -- cgit From 09f69254b5af4b9ee40f9848e47f1b2187599cb5 Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Wed, 14 Jul 2010 19:38:41 -0400 Subject: Whitespace fix. --- bin/nova-api | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/nova-api') diff --git a/bin/nova-api b/bin/nova-api index f0f79a236..893eb201d 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -20,7 +20,7 @@ # under the License. """ -Tornado daemon for the main API endpoint. +Tornado daemon for the main API endpoint. """ import logging -- cgit From ced951677c72307f173d37ef6d119d3202ace355 Mon Sep 17 00:00:00 2001 From: Todd Willey Date: Wed, 14 Jul 2010 19:51:38 -0400 Subject: Finish singletonizing UserManager usage. --- bin/nova-api | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'bin/nova-api') diff --git a/bin/nova-api b/bin/nova-api index 893eb201d..1bef778c5 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -43,13 +43,11 @@ FLAGS = flags.FLAGS def main(_argv): - user_manager = users.UserManager() - host_manager = model.Host controllers = { 'Cloud': cloud.CloudController(), - 'Admin': admin.AdminController(user_manager, host_manager) + 'Admin': admin.AdminController() } - _app = api.APIServerApplication(user_manager, controllers) + _app = api.APIServerApplication(controllers) conn = rpc.Connection.instance() consumer = rpc.AdapterConsumer(connection=conn, -- cgit