fix copyrights for new files, etc

4 files changed, 24 insertions, 17 deletions

diff --git a/bin/nova-listinstances b/bin/nova-listinstances
index 2f8ff28f9..386283d2f 100755
--- a/bin/nova-listinstances
+++ b/bin/nova-listinstances
@@ -1,4 +1,19 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2010 Openstack, 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.
 
 #
 # Duplicates the functionality of euca-describe-instances, but doesn't require
@@ -6,6 +21,10 @@
 # mostly a test program written for the scheduler
 #
 
+"""
+List instances by doing a direct query to the datastore
+"""
+
 from nova.compute import model
 
 data_needed = ['image_id', 'memory_kb', 'local_gb', 'node_name', 'vcpus']
diff --git a/nova/scheduler/__init__.py b/nova/scheduler/__init__.py
index 516ea61bc..8359a7aeb 100644
--- a/nova/scheduler/__init__.py
+++ b/nova/scheduler/__init__.py
@@ -1,8 +1,6 @@
 # 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) 2010 Openstack, 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
@@ -22,12 +20,6 @@
 
 .. automodule:: nova.scheduler
    :platform: Unix
-   :synopsis: Daemon that picks a host for a VM instance.
-.. moduleauthor:: Jesse Andrews <jesse@ansolabs.com>
-.. moduleauthor:: Devin Carlen <devin.carlen@gmail.com>
-.. moduleauthor:: Vishvananda Ishaya <vishvananda@yahoo.com>
-.. moduleauthor:: Joshua McKenty <joshua@cognition.ca>
-.. moduleauthor:: Manish Singh <yosh@gimp.org>
-.. moduleauthor:: Andy Smith <andy@anarkystic.com>
+   :synopsis: Module that picks a compute node to run a VM instance.
 .. moduleauthor:: Chris Behrens <cbehrens@codestud.com>
 """
diff --git a/nova/scheduler/scheduler.py b/nova/scheduler/scheduler.py
index 0da7b95cf..79ed9dc06 100644
--- a/nova/scheduler/scheduler.py
+++ b/nova/scheduler/scheduler.py
@@ -1,8 +1,6 @@
 # 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) 2010 Openstack, 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
diff --git a/nova/scheduler/service.py b/nova/scheduler/service.py
index 3a86cefbe..39bfd6e07 100644
--- a/nova/scheduler/service.py
+++ b/nova/scheduler/service.py
@@ -1,8 +1,6 @@
 # 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) 2010 Openstack, 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