diff --git a/CA/geninter.sh b/CA/geninter.sh index 2aa64a8420f2..6c0528d1b0f0 100755 --- a/CA/geninter.sh +++ b/CA/geninter.sh @@ -1,19 +1,20 @@ #!/bin/bash -# 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. +# +# 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. # ARG is the id of the user export SUBJ=/C=US/ST=California/L=Mountain View/O=Anso Labs/OU=Nova Dev/CN=customer-intCA-$3 diff --git a/CA/genrootca.sh b/CA/genrootca.sh index e21f48d77ab9..31976092ef35 100755 --- a/CA/genrootca.sh +++ b/CA/genrootca.sh @@ -1,18 +1,20 @@ #!/bin/bash -# Copyright [2010] [Anso Labs, LLC] +# 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 +# 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. +# 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. if [ -f "cacert.pem" ]; then diff --git a/CA/openssl.cnf.tmpl b/CA/openssl.cnf.tmpl index b06f1cca0b78..639b8e80a555 100644 --- a/CA/openssl.cnf.tmpl +++ b/CA/openssl.cnf.tmpl @@ -1,16 +1,18 @@ -# 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. +# +# 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. # # OpenSSL configuration file. diff --git a/bin/dhcpleasor.py b/bin/dhcpleasor.py index 30f8fbdc3a2b..31f4433fb3fe 100755 --- a/bin/dhcpleasor.py +++ b/bin/dhcpleasor.py @@ -5,8 +5,6 @@ # 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 diff --git a/bin/nova-api b/bin/nova-api index 1bef778c5df8..7bc9166b80dc 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -5,8 +5,6 @@ # 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 diff --git a/bin/nova-compute b/bin/nova-compute index 1b438f6a7dbf..8038870393e2 100755 --- a/bin/nova-compute +++ b/bin/nova-compute @@ -5,8 +5,6 @@ # 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 diff --git a/bin/nova-import-canonical-imagestore b/bin/nova-import-canonical-imagestore index 804b0e272412..82daf61ce654 100755 --- a/bin/nova-import-canonical-imagestore +++ b/bin/nova-import-canonical-imagestore @@ -1,6 +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. +# +# 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. + """ Download images from Canonical Image Store """ diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor index 1f22b424e383..d3f0ae221ee0 100755 --- a/bin/nova-instancemonitor +++ b/bin/nova-instancemonitor @@ -5,8 +5,6 @@ # 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 diff --git a/bin/nova-manage b/bin/nova-manage index 12e4c932460a..5693a40f6a31 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -5,8 +5,6 @@ # 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 diff --git a/bin/nova-objectstore b/bin/nova-objectstore index f6d7b1270858..7876864c0f7d 100755 --- a/bin/nova-objectstore +++ b/bin/nova-objectstore @@ -5,8 +5,6 @@ # 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 diff --git a/bin/nova-rsapi b/bin/nova-rsapi index 24b469f750e6..c2f2c9d703f5 100755 --- a/bin/nova-rsapi +++ b/bin/nova-rsapi @@ -1,7 +1,9 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright [2010] [Anso Labs, LLC] +# 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. diff --git a/bin/nova-volume b/bin/nova-volume index 2720e12cd1e8..9b7787c96fd2 100755 --- a/bin/nova-volume +++ b/bin/nova-volume @@ -5,8 +5,6 @@ # 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 diff --git a/builddeb.sh b/builddeb.sh index 2fb20da2a38f..e354dc241923 100755 --- a/builddeb.sh +++ b/builddeb.sh @@ -1,12 +1,9 @@ #!/bin/sh -# 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 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 @@ -20,3 +17,4 @@ # under the License. dpkg-buildpackage -b -rfakeroot -tc -uc -D + diff --git a/docs/architecture.rst b/docs/architecture.rst index 0000a02dd265..11813d2c8c3a 100644 --- a/docs/architecture.rst +++ b/docs/architecture.rst @@ -3,8 +3,6 @@ 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 diff --git a/docs/auth.rst b/docs/auth.rst index c906a481f6c0..476ca9154006 100644 --- a/docs/auth.rst +++ b/docs/auth.rst @@ -3,8 +3,6 @@ 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 diff --git a/docs/binaries.rst b/docs/binaries.rst index fa6127bb7769..90a9581f7f8d 100644 --- a/docs/binaries.rst +++ b/docs/binaries.rst @@ -3,8 +3,6 @@ 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 @@ -30,4 +28,4 @@ The configuration of these binaries relies on "flagfiles" using the google gflags package. If present, the nova.conf file will be used as the flagfile - otherwise, it must be specified on the command line:: - $ python node_worker.py --flagfile flagfile \ No newline at end of file + $ python node_worker.py --flagfile flagfile diff --git a/docs/compute.rst b/docs/compute.rst index 7b4f82a3b0a2..5b08dbd5b2af 100644 --- a/docs/compute.rst +++ b/docs/compute.rst @@ -3,8 +3,6 @@ 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 diff --git a/docs/conf.py b/docs/conf.py index bc61f438c994..784d8c0965e0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = u'nova' -copyright = u'2010, Anso Labs, LLC' +copyright = u'2010, United States Government as represented by the Administrator of the National Aeronautics and Space Administration.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/endpoint.rst b/docs/endpoint.rst index 830c996655ba..399df416189e 100644 --- a/docs/endpoint.rst +++ b/docs/endpoint.rst @@ -3,8 +3,6 @@ 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 diff --git a/docs/fakes.rst b/docs/fakes.rst index 1454ca7b5284..bea8bc4e967e 100644 --- a/docs/fakes.rst +++ b/docs/fakes.rst @@ -3,8 +3,6 @@ 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 diff --git a/docs/getting.started.rst b/docs/getting.started.rst index 55a73dd00b09..3eadd088270a 100644 --- a/docs/getting.started.rst +++ b/docs/getting.started.rst @@ -1,3 +1,20 @@ +.. + 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. + Getting Started with Nova ========================= diff --git a/docs/index.rst b/docs/index.rst index 9a5fa32ae704..039bf00fff19 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,8 +3,6 @@ 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 diff --git a/docs/modules.rst b/docs/modules.rst index 11e1eef7d53f..82c61f008de8 100644 --- a/docs/modules.rst +++ b/docs/modules.rst @@ -3,8 +3,6 @@ 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 diff --git a/docs/network.rst b/docs/network.rst index 2787ae4588a0..357a0517f35a 100644 --- a/docs/network.rst +++ b/docs/network.rst @@ -3,8 +3,6 @@ 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 @@ -87,4 +85,4 @@ Public Traffic:: The RoutingNode is currently implemented using IPTables rules, which implement both NATing of public IP addresses, and the appropriate firewall chains. We are also looking at using Netomata / Clusto to manage NATting within a switch or router, and/or to manage firewall rules within a hardware firewall appliance. -Similarly, the AddressingNode currently manages running DNSMasq instances for DHCP services. However, we could run an internal DHCP server (using Scapy ala Clusto), or even switch to static addressing by inserting the private address into the disk image the same way we insert the SSH keys. (See compute for more details). \ No newline at end of file +Similarly, the AddressingNode currently manages running DNSMasq instances for DHCP services. However, we could run an internal DHCP server (using Scapy ala Clusto), or even switch to static addressing by inserting the private address into the disk image the same way we insert the SSH keys. (See compute for more details). diff --git a/docs/nova.rst b/docs/nova.rst index 01da34414a1c..4b9c44a5f027 100644 --- a/docs/nova.rst +++ b/docs/nova.rst @@ -3,8 +3,6 @@ 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 diff --git a/docs/objectstore.rst b/docs/objectstore.rst index 70048354ada5..6b8d293f46f7 100644 --- a/docs/objectstore.rst +++ b/docs/objectstore.rst @@ -3,8 +3,6 @@ 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 diff --git a/docs/packages.rst b/docs/packages.rst index fb28e850b421..6029ad7d749b 100644 --- a/docs/packages.rst +++ b/docs/packages.rst @@ -3,8 +3,6 @@ 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 diff --git a/docs/storage.rst b/docs/storage.rst index f8c98b18df34..f77e5f0e523a 100644 --- a/docs/storage.rst +++ b/docs/storage.rst @@ -3,8 +3,6 @@ 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 @@ -30,4 +28,4 @@ There are three primary classes of storage in a nova cloud environment: :maxdepth: 2 volume - objectstore \ No newline at end of file + objectstore diff --git a/docs/volume.rst b/docs/volume.rst index 3981daf92422..619968458d43 100644 --- a/docs/volume.rst +++ b/docs/volume.rst @@ -3,8 +3,6 @@ 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 diff --git a/exercise_rsapi.py b/exercise_rsapi.py index 4b9e65fc6f4d..20589b9cb1bf 100644 --- a/exercise_rsapi.py +++ b/exercise_rsapi.py @@ -1,3 +1,21 @@ +# 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. + import cloudservers class IdFake: diff --git a/nova/__init__.py b/nova/__init__.py index 1c886716f8bb..8745617bc96c 100644 --- a/nova/__init__.py +++ b/nova/__init__.py @@ -4,8 +4,6 @@ # 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 @@ -33,4 +31,4 @@ .. moduleauthor:: Andy Smith """ -from exception import * \ No newline at end of file +from exception import * diff --git a/nova/adminclient.py b/nova/adminclient.py index 3d239fb1de3d..1a5f41418101 100644 --- a/nova/adminclient.py +++ b/nova/adminclient.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/auth/__init__.py b/nova/auth/__init__.py index 0d115e9d9d10..e2a140e83317 100644 --- a/nova/auth/__init__.py +++ b/nova/auth/__init__.py @@ -4,8 +4,6 @@ # 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 @@ -27,4 +25,4 @@ .. moduleauthor:: Jesse Andrews .. moduleauthor:: Vishvananda Ishaya .. moduleauthor:: Joshua McKenty -""" \ No newline at end of file +""" diff --git a/nova/auth/fakeldap.py b/nova/auth/fakeldap.py index 116fcbb78b4d..4c32ed9d92a5 100644 --- a/nova/auth/fakeldap.py +++ b/nova/auth/fakeldap.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/auth/novarc.template b/nova/auth/novarc.template index b6d65297ad69..1b8ecb1734b5 100644 --- a/nova/auth/novarc.template +++ b/nova/auth/novarc.template @@ -1,23 +1,3 @@ -# 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 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. - NOVA_KEY_DIR=$(pushd $(dirname $BASH_SOURCE)>/dev/null; pwd; popd>/dev/null) export EC2_ACCESS_KEY="%(access)s:%(project)s" export EC2_SECRET_KEY="%(secret)s" diff --git a/nova/auth/rbac.py b/nova/auth/rbac.py index f4abd1075050..9e2bb830c213 100644 --- a/nova/auth/rbac.py +++ b/nova/auth/rbac.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/auth/signer.py b/nova/auth/signer.py index 4f7ac43bc37f..a3d3c5329a44 100644 --- a/nova/auth/signer.py +++ b/nova/auth/signer.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/auth/slap.sh b/nova/auth/slap.sh index 90dc7a9d65e7..fdc0e39dc16a 100755 --- a/nova/auth/slap.sh +++ b/nova/auth/slap.sh @@ -5,8 +5,6 @@ # 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 diff --git a/nova/auth/users.py b/nova/auth/users.py index 0ee2d4441bbe..72edcc2aa464 100644 --- a/nova/auth/users.py +++ b/nova/auth/users.py @@ -1,12 +1,9 @@ -#!/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 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 diff --git a/nova/cloudpipe/__init__.py b/nova/cloudpipe/__init__.py index 57ef146512ca..cfadc30e9c75 100644 --- a/nova/cloudpipe/__init__.py +++ b/nova/cloudpipe/__init__.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/cloudpipe/api.py b/nova/cloudpipe/api.py index 610239c2e4ba..99a0a1d6da6a 100644 --- a/nova/cloudpipe/api.py +++ b/nova/cloudpipe/api.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/cloudpipe/bootscript.sh b/nova/cloudpipe/bootscript.sh index 639aad66fbe6..43fc2ecab06e 100755 --- a/nova/cloudpipe/bootscript.sh +++ b/nova/cloudpipe/bootscript.sh @@ -5,8 +5,6 @@ # 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 diff --git a/nova/cloudpipe/client.ovpn.template b/nova/cloudpipe/client.ovpn.template index a8ec5dc6e7b7..e127eb9f021c 100644 --- a/nova/cloudpipe/client.ovpn.template +++ b/nova/cloudpipe/client.ovpn.template @@ -4,8 +4,6 @@ # 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 diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 5f6ccf82e9b8..de5326c5e0be 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/compute/__init__.py b/nova/compute/__init__.py index 1c688c1006f4..a5df2ec1acc2 100644 --- a/nova/compute/__init__.py +++ b/nova/compute/__init__.py @@ -4,8 +4,6 @@ # 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 @@ -31,4 +29,4 @@ .. moduleauthor:: Joshua McKenty .. moduleauthor:: Manish Singh .. moduleauthor:: Andy Smith -""" \ No newline at end of file +""" diff --git a/nova/compute/disk.py b/nova/compute/disk.py index b6398f41eccd..b24a90d7f5be 100644 --- a/nova/compute/disk.py +++ b/nova/compute/disk.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/compute/exception.py b/nova/compute/exception.py index b2bfc39e65ce..fefa7451daff 100644 --- a/nova/compute/exception.py +++ b/nova/compute/exception.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/compute/fakevirtinstance.xml b/nova/compute/fakevirtinstance.xml index 0df76f5efbbf..81640d0aee7e 100644 --- a/nova/compute/fakevirtinstance.xml +++ b/nova/compute/fakevirtinstance.xml @@ -1,22 +1,3 @@ - i-A9B8C7D6 12a345bc-67c8-901d-2e34-56f7g89012h3 @@ -44,4 +25,4 @@ - \ No newline at end of file + diff --git a/nova/compute/libvirt.xml.template b/nova/compute/libvirt.xml.template index 11dab7eb83df..a763e8a4d7a4 100644 --- a/nova/compute/libvirt.xml.template +++ b/nova/compute/libvirt.xml.template @@ -1,22 +1,3 @@ - %(name)s diff --git a/nova/compute/linux_net.py b/nova/compute/linux_net.py index c9e5bb1a74e0..358f184af965 100644 --- a/nova/compute/linux_net.py +++ b/nova/compute/linux_net.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/compute/model.py b/nova/compute/model.py index cc5f74b3d856..f1eb99e7432c 100644 --- a/nova/compute/model.py +++ b/nova/compute/model.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/compute/monitor.py b/nova/compute/monitor.py index c17cd0be479b..b9fe20a71573 100644 --- a/nova/compute/monitor.py +++ b/nova/compute/monitor.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/compute/network.py b/nova/compute/network.py index e5d3d18dfe6d..8592d7af7c91 100644 --- a/nova/compute/network.py +++ b/nova/compute/network.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/compute/node.py b/nova/compute/node.py index f41bc34ead4b..7e4277f58d3a 100644 --- a/nova/compute/node.py +++ b/nova/compute/node.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/crypto.py b/nova/crypto.py index fc6ed714fd8d..98d412687089 100644 --- a/nova/crypto.py +++ b/nova/crypto.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/datastore.py b/nova/datastore.py index da3e01c252ed..8d6272ada285 100644 --- a/nova/datastore.py +++ b/nova/datastore.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/endpoint/__init__.py b/nova/endpoint/__init__.py index 00ebd398c21e..7536851497a6 100644 --- a/nova/endpoint/__init__.py +++ b/nova/endpoint/__init__.py @@ -4,8 +4,6 @@ # 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 @@ -31,4 +29,4 @@ .. moduleauthor:: Joshua McKenty .. moduleauthor:: Manish Singh .. moduleauthor:: Andy Smith -""" \ No newline at end of file +""" diff --git a/nova/endpoint/admin.py b/nova/endpoint/admin.py index ceab7d1f95bd..b97a6727f4d0 100644 --- a/nova/endpoint/admin.py +++ b/nova/endpoint/admin.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/endpoint/api.py b/nova/endpoint/api.py index 86a4551ad3f9..255519198ff2 100755 --- a/nova/endpoint/api.py +++ b/nova/endpoint/api.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 32c7cbce0dda..5b713feb9f53 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/endpoint/images.py b/nova/endpoint/images.py index 420b491f938d..5c6514732614 100644 --- a/nova/endpoint/images.py +++ b/nova/endpoint/images.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/endpoint/rackspace.py b/nova/endpoint/rackspace.py index ac32d20a415d..29a077b24456 100644 --- a/nova/endpoint/rackspace.py +++ b/nova/endpoint/rackspace.py @@ -1,17 +1,20 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright [2010] [Anso Labs, LLC] + +# 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 +# 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. +# 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. """ Rackspace API diff --git a/nova/endpoint/wsgi.py b/nova/endpoint/wsgi.py index e0817fd0e2dc..b7bb588c39ec 100644 --- a/nova/endpoint/wsgi.py +++ b/nova/endpoint/wsgi.py @@ -1,3 +1,20 @@ +# 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. ''' Utility methods for working with WSGI servers diff --git a/nova/exception.py b/nova/exception.py index ebd85a5a78c8..09d894e4b39d 100644 --- a/nova/exception.py +++ b/nova/exception.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/fakerabbit.py b/nova/fakerabbit.py index acb4d276c4a7..00eb183272b0 100644 --- a/nova/fakerabbit.py +++ b/nova/fakerabbit.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/fakevirt.py b/nova/fakevirt.py index aec2fe0ca9e5..bcbeae548faf 100644 --- a/nova/fakevirt.py +++ b/nova/fakevirt.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/flags.py b/nova/flags.py index 985f9ba04e7a..22e00a44a2c3 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/objectstore/__init__.py b/nova/objectstore/__init__.py index 25e9bf74a3f8..b8890ac03356 100644 --- a/nova/objectstore/__init__.py +++ b/nova/objectstore/__init__.py @@ -4,8 +4,6 @@ # 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 @@ -31,4 +29,4 @@ .. moduleauthor:: Joshua McKenty .. moduleauthor:: Manish Singh .. moduleauthor:: Andy Smith -""" \ No newline at end of file +""" diff --git a/nova/objectstore/bucket.py b/nova/objectstore/bucket.py index a9dec5afbf49..61feb4a4c3a3 100644 --- a/nova/objectstore/bucket.py +++ b/nova/objectstore/bucket.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/objectstore/handler.py b/nova/objectstore/handler.py index 2482f6feaed2..22cfca5fd6f7 100644 --- a/nova/objectstore/handler.py +++ b/nova/objectstore/handler.py @@ -4,8 +4,6 @@ # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # -# Copyright 2010 Anso Labs, LLC -# # Copyright 2009 Facebook # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/nova/objectstore/image.py b/nova/objectstore/image.py index 4de41ea96dd6..bea2e96378be 100644 --- a/nova/objectstore/image.py +++ b/nova/objectstore/image.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/objectstore/stored.py b/nova/objectstore/stored.py index fc656a04002c..f1730cbc71aa 100644 --- a/nova/objectstore/stored.py +++ b/nova/objectstore/stored.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/process.py b/nova/process.py index bc2d4474baa2..00ec4a26729e 100644 --- a/nova/process.py +++ b/nova/process.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/rpc.py b/nova/rpc.py index b0f6ef7f3711..72a84b7f7583 100644 --- a/nova/rpc.py +++ b/nova/rpc.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/server.py b/nova/server.py index 49d5a1e8923d..1a6f3387666c 100644 --- a/nova/server.py +++ b/nova/server.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/test.py b/nova/test.py index fa05a02af86c..1f8a5ff473d6 100644 --- a/nova/test.py +++ b/nova/test.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py index de4a3531a968..aaf213923eb8 100644 --- a/nova/tests/__init__.py +++ b/nova/tests/__init__.py @@ -4,8 +4,6 @@ # 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 @@ -30,4 +28,4 @@ .. moduleauthor:: Joshua McKenty .. moduleauthor:: Manish Singh .. moduleauthor:: Andy Smith -""" \ No newline at end of file +""" diff --git a/nova/tests/access_unittest.py b/nova/tests/access_unittest.py index fc2c1922737a..609bda901eb1 100644 --- a/nova/tests/access_unittest.py +++ b/nova/tests/access_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/api_integration.py b/nova/tests/api_integration.py index 0216b16ec3ee..0ccf69525492 100644 --- a/nova/tests/api_integration.py +++ b/nova/tests/api_integration.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py index d82089e6f85c..aee57b5140e3 100644 --- a/nova/tests/api_unittest.py +++ b/nova/tests/api_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py index 992fc8c90c2c..9df83ec625ab 100644 --- a/nova/tests/cloud_unittest.py +++ b/nova/tests/cloud_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py index cbc0042da094..d32f40d8f975 100644 --- a/nova/tests/fake_flags.py +++ b/nova/tests/fake_flags.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/future_unittest.py b/nova/tests/future_unittest.py index af86f2788a46..be4218c398ac 100644 --- a/nova/tests/future_unittest.py +++ b/nova/tests/future_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/model_unittest.py b/nova/tests/model_unittest.py index 23e2f9e734a6..f70cab40dd46 100644 --- a/nova/tests/model_unittest.py +++ b/nova/tests/model_unittest.py @@ -1,17 +1,20 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright [2010] [Anso Labs, LLC] + +# 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 +# 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. +# 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. import logging import time diff --git a/nova/tests/network_unittest.py b/nova/tests/network_unittest.py index bccaacfa76dc..dd1966ffac7e 100644 --- a/nova/tests/network_unittest.py +++ b/nova/tests/network_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/node_unittest.py b/nova/tests/node_unittest.py index 44c8d042173f..4f7bbd587ea8 100644 --- a/nova/tests/node_unittest.py +++ b/nova/tests/node_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/objectstore_unittest.py b/nova/tests/objectstore_unittest.py index ddd455a73433..7f85b8ee52bf 100644 --- a/nova/tests/objectstore_unittest.py +++ b/nova/tests/objectstore_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/process_unittest.py b/nova/tests/process_unittest.py index 4e891fca7a17..671ab05cd9b2 100644 --- a/nova/tests/process_unittest.py +++ b/nova/tests/process_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/real_flags.py b/nova/tests/real_flags.py index b30987f1eed5..9e106f22763b 100644 --- a/nova/tests/real_flags.py +++ b/nova/tests/real_flags.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/storage_unittest.py b/nova/tests/storage_unittest.py index e1377eeb86bd..b04602b7138f 100644 --- a/nova/tests/storage_unittest.py +++ b/nova/tests/storage_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/users_unittest.py b/nova/tests/users_unittest.py index a31ad4d7a361..6110248b5045 100644 --- a/nova/tests/users_unittest.py +++ b/nova/tests/users_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/tests/validator_unittest.py b/nova/tests/validator_unittest.py index eea1beccb62a..38cddfef1f3c 100644 --- a/nova/tests/validator_unittest.py +++ b/nova/tests/validator_unittest.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/twistd.py b/nova/twistd.py index 44a19e9dcd7f..03de2d0ab004 100644 --- a/nova/twistd.py +++ b/nova/twistd.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/utils.py b/nova/utils.py index 2982b548079d..25181332dd95 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/validate.py b/nova/validate.py index 820546b7314a..a69306fad0d6 100644 --- a/nova/validate.py +++ b/nova/validate.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/vendor.py b/nova/vendor.py index 77bfe4be5069..552f790ba4c1 100644 --- a/nova/vendor.py +++ b/nova/vendor.py @@ -4,8 +4,6 @@ # 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 diff --git a/nova/volume/__init__.py b/nova/volume/__init__.py index ad2181525fb7..d6e944fc0bdf 100644 --- a/nova/volume/__init__.py +++ b/nova/volume/__init__.py @@ -4,8 +4,6 @@ # 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 @@ -30,4 +28,4 @@ .. moduleauthor:: Joshua McKenty .. moduleauthor:: Manish Singh .. moduleauthor:: Andy Smith -""" \ No newline at end of file +""" diff --git a/nova/volume/storage.py b/nova/volume/storage.py index e329448156ec..1507b4ec704f 100644 --- a/nova/volume/storage.py +++ b/nova/volume/storage.py @@ -4,8 +4,6 @@ # 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 diff --git a/run_tests.py b/run_tests.py index d6f68f830f3d..bd1587d439ab 100644 --- a/run_tests.py +++ b/run_tests.py @@ -4,8 +4,6 @@ # 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 diff --git a/setup.py b/setup.py index 95d0ee7d1d76..eb42283eaa1a 100644 --- a/setup.py +++ b/setup.py @@ -4,8 +4,6 @@ # 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 diff --git a/smoketests/__init__.py b/smoketests/__init__.py index ddd6919a09dd..dbc926f1e38e 100644 --- a/smoketests/__init__.py +++ b/smoketests/__init__.py @@ -4,8 +4,6 @@ # 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 @@ -30,4 +28,4 @@ .. moduleauthor:: Joshua McKenty .. moduleauthor:: Manish Singh .. moduleauthor:: Andy Smith -""" \ No newline at end of file +""" diff --git a/smoketests/flags.py b/smoketests/flags.py index f239c5f4024c..ae0001e89a0e 100644 --- a/smoketests/flags.py +++ b/smoketests/flags.py @@ -4,8 +4,6 @@ # 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 diff --git a/smoketests/novatestcase.py b/smoketests/novatestcase.py index c19ef781bdb3..11c8661bae51 100644 --- a/smoketests/novatestcase.py +++ b/smoketests/novatestcase.py @@ -4,8 +4,6 @@ # 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 diff --git a/smoketests/smoketest.py b/smoketests/smoketest.py index b752d814a699..61967d3b7b2b 100644 --- a/smoketests/smoketest.py +++ b/smoketests/smoketest.py @@ -4,8 +4,6 @@ # 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 diff --git a/tools/clean-vlans b/tools/clean-vlans index c345de912725..f5b0295ad1ee 100755 --- a/tools/clean-vlans +++ b/tools/clean-vlans @@ -5,8 +5,6 @@ # 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