diff --git a/nova/api/openstack/compute/contrib/extended_services.py b/nova/api/openstack/compute/contrib/extended_services.py index f9f1a4d86ab6..c61d74ff1111 100644 --- a/nova/api/openstack/compute/contrib/extended_services.py +++ b/nova/api/openstack/compute/contrib/extended_services.py @@ -1,3 +1,15 @@ +# 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. + from nova.api.openstack import extensions diff --git a/nova/api/openstack/compute/contrib/networks_associate.py b/nova/api/openstack/compute/contrib/networks_associate.py index eb4c8c8baf98..a180eda23e8a 100644 --- a/nova/api/openstack/compute/contrib/networks_associate.py +++ b/nova/api/openstack/compute/contrib/networks_associate.py @@ -1,3 +1,15 @@ +# 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. + from webob import exc from nova.api.openstack import extensions diff --git a/nova/console/__init__.py b/nova/console/__init__.py index aad20bd1d70d..4ee17c821666 100644 --- a/nova/console/__init__.py +++ b/nova/console/__init__.py @@ -1,5 +1,17 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# 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. + """ :mod:`nova.console` -- Console Proxy to set up VM console access (i.e. with xvp) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/171_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/171_placeholder.py index 39d30e62bb3a..672354e9cefc 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/171_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/171_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Grizzly backports. # Do not use this number for new Havana work. New Havana work starts after # all the placeholders. diff --git a/nova/db/sqlalchemy/migrate_repo/versions/217_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/217_placeholder.py index a5c6f7e40724..b1a618ef0e85 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/217_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/217_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Havana backports. # Do not use this number for new Icehouse work. New Icehouse work starts after # all the placeholders. diff --git a/nova/db/sqlalchemy/migrate_repo/versions/218_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/218_placeholder.py index a5c6f7e40724..b1a618ef0e85 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/218_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/218_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Havana backports. # Do not use this number for new Icehouse work. New Icehouse work starts after # all the placeholders. diff --git a/nova/db/sqlalchemy/migrate_repo/versions/219_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/219_placeholder.py index a5c6f7e40724..b1a618ef0e85 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/219_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/219_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Havana backports. # Do not use this number for new Icehouse work. New Icehouse work starts after # all the placeholders. diff --git a/nova/db/sqlalchemy/migrate_repo/versions/220_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/220_placeholder.py index a5c6f7e40724..b1a618ef0e85 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/220_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/220_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Havana backports. # Do not use this number for new Icehouse work. New Icehouse work starts after # all the placeholders. diff --git a/nova/db/sqlalchemy/migrate_repo/versions/221_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/221_placeholder.py index a5c6f7e40724..b1a618ef0e85 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/221_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/221_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Havana backports. # Do not use this number for new Icehouse work. New Icehouse work starts after # all the placeholders. diff --git a/nova/db/sqlalchemy/migrate_repo/versions/222_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/222_placeholder.py index a5c6f7e40724..b1a618ef0e85 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/222_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/222_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Havana backports. # Do not use this number for new Icehouse work. New Icehouse work starts after # all the placeholders. diff --git a/nova/db/sqlalchemy/migrate_repo/versions/223_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/223_placeholder.py index a5c6f7e40724..b1a618ef0e85 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/223_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/223_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Havana backports. # Do not use this number for new Icehouse work. New Icehouse work starts after # all the placeholders. diff --git a/nova/db/sqlalchemy/migrate_repo/versions/224_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/224_placeholder.py index a5c6f7e40724..b1a618ef0e85 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/224_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/224_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Havana backports. # Do not use this number for new Icehouse work. New Icehouse work starts after # all the placeholders. diff --git a/nova/db/sqlalchemy/migrate_repo/versions/225_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/225_placeholder.py index a5c6f7e40724..b1a618ef0e85 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/225_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/225_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Havana backports. # Do not use this number for new Icehouse work. New Icehouse work starts after # all the placeholders. diff --git a/nova/db/sqlalchemy/migrate_repo/versions/226_placeholder.py b/nova/db/sqlalchemy/migrate_repo/versions/226_placeholder.py index a5c6f7e40724..b1a618ef0e85 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/226_placeholder.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/226_placeholder.py @@ -1,3 +1,15 @@ +# 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. + # This is a placeholder for Havana backports. # Do not use this number for new Icehouse work. New Icehouse work starts after # all the placeholders. diff --git a/nova/tests/api/openstack/test_wsgi.py b/nova/tests/api/openstack/test_wsgi.py index 0ceb7f9fe69b..0b8676575023 100644 --- a/nova/tests/api/openstack/test_wsgi.py +++ b/nova/tests/api/openstack/test_wsgi.py @@ -1,5 +1,17 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 +# 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 inspect import webob diff --git a/tox.ini b/tox.ini index 8f5970705e3e..7ee87357e266 100644 --- a/tox.ini +++ b/tox.ini @@ -46,10 +46,9 @@ commands = {posargs} # in sqlalchemy. # H803 skipped on purpose per list discussion. # TODO Hacking 0.6 checks to fix -# H102 Apache 2.0 license header not found # E125 is deliberately excluded. See https://github.com/jcrocholl/pep8/issues/126 -ignore = E121,E122,E123,E124,E125,E126,E127,E128,E711,E712,H102,H404,F403,F811,F841,H803 +ignore = E121,E122,E123,E124,E125,E126,E127,E128,E711,E712,H404,F403,F811,F841,H803 exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools [hacking]