summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2010-08-06 18:10:41 -0500
committerChris Behrens <cbehrens@codestud.com>2010-08-06 18:10:41 -0500
commit094d64334e419d86a550c913ea4f0b8f086777bd (patch)
treee4ae5c1a874f82638f6e169cdf87d80ad1d2d3b0 /bin
parent6c4e257b6df94b8c8e0745e8c3d0701293ae588e (diff)
downloadnova-094d64334e419d86a550c913ea4f0b8f086777bd.tar.gz
nova-094d64334e419d86a550c913ea4f0b8f086777bd.tar.xz
nova-094d64334e419d86a550c913ea4f0b8f086777bd.zip
fix copyrights for new files, etc
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-listinstances21
1 files changed, 20 insertions, 1 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']