diff --git a/ironic/api/__init__.py b/ironic/api/__init__.py index 17194c8ea6..e1963e664c 100644 --- a/ironic/api/__init__.py +++ b/ironic/api/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/api/app.py b/ironic/api/app.py index 177b953b76..605e7c4a7a 100644 --- a/ironic/api/app.py +++ b/ironic/api/app.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # Copyright © 2012 New Dream Network, LLC (DreamHost) diff --git a/ironic/api/config.py b/ironic/api/config.py index 24d621ece6..058c2e4cfb 100644 --- a/ironic/api/config.py +++ b/ironic/api/config.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/api/controllers/v1/__init__.py b/ironic/api/controllers/v1/__init__.py index 6e3148f55b..fa2dff4582 100644 --- a/ironic/api/controllers/v1/__init__.py +++ b/ironic/api/controllers/v1/__init__.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/api/controllers/v1/base.py b/ironic/api/controllers/v1/base.py index 7e7a49a8d2..0a3fb18fe0 100644 --- a/ironic/api/controllers/v1/base.py +++ b/ironic/api/controllers/v1/base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/api/controllers/v1/chassis.py b/ironic/api/controllers/v1/chassis.py index 4f5b87b23a..0be5038852 100644 --- a/ironic/api/controllers/v1/chassis.py +++ b/ironic/api/controllers/v1/chassis.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/api/controllers/v1/collection.py b/ironic/api/controllers/v1/collection.py index 5f12b8fb9a..2ff0c9b76b 100644 --- a/ironic/api/controllers/v1/collection.py +++ b/ironic/api/controllers/v1/collection.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/api/controllers/v1/driver.py b/ironic/api/controllers/v1/driver.py index f758268257..fc76f875c1 100644 --- a/ironic/api/controllers/v1/driver.py +++ b/ironic/api/controllers/v1/driver.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/api/controllers/v1/link.py b/ironic/api/controllers/v1/link.py index 37d76f8cfd..dd542d7eaa 100644 --- a/ironic/api/controllers/v1/link.py +++ b/ironic/api/controllers/v1/link.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/api/controllers/v1/node.py b/ironic/api/controllers/v1/node.py index 6d8625ec1e..b0ea01ee99 100644 --- a/ironic/api/controllers/v1/node.py +++ b/ironic/api/controllers/v1/node.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/api/controllers/v1/port.py b/ironic/api/controllers/v1/port.py index 7e70b8064e..e082e898d4 100644 --- a/ironic/api/controllers/v1/port.py +++ b/ironic/api/controllers/v1/port.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 UnitedStack Inc. # All Rights Reserved. # diff --git a/ironic/api/controllers/v1/state.py b/ironic/api/controllers/v1/state.py index 2b2d440e23..3809d49f86 100644 --- a/ironic/api/controllers/v1/state.py +++ b/ironic/api/controllers/v1/state.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/api/controllers/v1/types.py b/ironic/api/controllers/v1/types.py index f70c042b7f..5411e2aa61 100644 --- a/ironic/api/controllers/v1/types.py +++ b/ironic/api/controllers/v1/types.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding: utf-8 # # Copyright 2013 Red Hat, Inc. diff --git a/ironic/api/controllers/v1/utils.py b/ironic/api/controllers/v1/utils.py index 97ef110e6c..6393e40c39 100644 --- a/ironic/api/controllers/v1/utils.py +++ b/ironic/api/controllers/v1/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/api/middleware/__init__.py b/ironic/api/middleware/__init__.py index 1673b9c002..609b4ed986 100644 --- a/ironic/api/middleware/__init__.py +++ b/ironic/api/middleware/__init__.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/api/middleware/auth_token.py b/ironic/api/middleware/auth_token.py index a44b8a29ab..d9c32b111c 100644 --- a/ironic/api/middleware/auth_token.py +++ b/ironic/api/middleware/auth_token.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/cmd/api.py b/ironic/cmd/api.py index 2fbb09e571..3b43543876 100644 --- a/ironic/cmd/api.py +++ b/ironic/cmd/api.py @@ -1,7 +1,5 @@ # -*- encoding: utf-8 -*- # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/cmd/conductor.py b/ironic/cmd/conductor.py index 9276fc6565..f11bc3608d 100644 --- a/ironic/cmd/conductor.py +++ b/ironic/cmd/conductor.py @@ -1,7 +1,5 @@ # -*- encoding: utf-8 -*- # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/cmd/dbsync.py b/ironic/cmd/dbsync.py index dbbe5c6474..d0d6ba6f04 100644 --- a/ironic/cmd/dbsync.py +++ b/ironic/cmd/dbsync.py @@ -1,7 +1,5 @@ # -*- encoding: utf-8 -*- # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/common/config.py b/ironic/common/config.py index ba6d268f9a..96640ec36c 100644 --- a/ironic/common/config.py +++ b/ironic/common/config.py @@ -1,5 +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. diff --git a/ironic/common/driver_factory.py b/ironic/common/driver_factory.py index 0ba161affd..439ac61f5c 100644 --- a/ironic/common/driver_factory.py +++ b/ironic/common/driver_factory.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/common/exception.py b/ironic/common/exception.py index cb9e41361a..743e1c0306 100644 --- a/ironic/common/exception.py +++ b/ironic/common/exception.py @@ -1,5 +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. diff --git a/ironic/common/glance_service/base_image_service.py b/ironic/common/glance_service/base_image_service.py index 6632c4f925..9888239cca 100644 --- a/ironic/common/glance_service/base_image_service.py +++ b/ironic/common/glance_service/base_image_service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010 OpenStack Foundation # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. diff --git a/ironic/common/glance_service/service.py b/ironic/common/glance_service/service.py index 9538dde869..1a7f8753ee 100644 --- a/ironic/common/glance_service/service.py +++ b/ironic/common/glance_service/service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/common/glance_service/service_utils.py b/ironic/common/glance_service/service_utils.py index 4517d83a4c..e937122c6a 100644 --- a/ironic/common/glance_service/service_utils.py +++ b/ironic/common/glance_service/service_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack Foundation # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. diff --git a/ironic/common/glance_service/v1/image_service.py b/ironic/common/glance_service/v1/image_service.py index 1838bfa71e..856a0fff54 100644 --- a/ironic/common/glance_service/v1/image_service.py +++ b/ironic/common/glance_service/v1/image_service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/common/glance_service/v2/image_service.py b/ironic/common/glance_service/v2/image_service.py index ec438a4645..8428049e68 100644 --- a/ironic/common/glance_service/v2/image_service.py +++ b/ironic/common/glance_service/v2/image_service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/common/hash_ring.py b/ironic/common/hash_ring.py index a68fa90e3d..74bb2c7f3d 100644 --- a/ironic/common/hash_ring.py +++ b/ironic/common/hash_ring.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/common/image_service.py b/ironic/common/image_service.py index 8c9e078e6a..b43b7ffccf 100644 --- a/ironic/common/image_service.py +++ b/ironic/common/image_service.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 OpenStack Foundation # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. diff --git a/ironic/common/images.py b/ironic/common/images.py index c7ef51ce54..f10867001f 100644 --- a/ironic/common/images.py +++ b/ironic/common/images.py @@ -1,5 +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. diff --git a/ironic/common/keystone.py b/ironic/common/keystone.py index 3c3d4f6b5b..34a9b21e10 100644 --- a/ironic/common/keystone.py +++ b/ironic/common/keystone.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/common/paths.py b/ironic/common/paths.py index 959035aeff..f2116453a5 100644 --- a/ironic/common/paths.py +++ b/ironic/common/paths.py @@ -1,5 +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. diff --git a/ironic/common/policy.py b/ironic/common/policy.py index aa23501770..66e5a1d330 100644 --- a/ironic/common/policy.py +++ b/ironic/common/policy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/ironic/common/safe_utils.py b/ironic/common/safe_utils.py index 9c8fc28106..a6d2734733 100644 --- a/ironic/common/safe_utils.py +++ b/ironic/common/safe_utils.py @@ -1,5 +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. # Copyright 2011 Justin Santa Barbara diff --git a/ironic/common/states.py b/ironic/common/states.py index 6b6fee47b4..c16590e414 100644 --- a/ironic/common/states.py +++ b/ironic/common/states.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright 2010 OpenStack Foundation # All Rights Reserved. diff --git a/ironic/common/utils.py b/ironic/common/utils.py index a332b0c0e1..bea7134c0e 100644 --- a/ironic/common/utils.py +++ b/ironic/common/utils.py @@ -1,5 +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. # Copyright 2011 Justin Santa Barbara diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index cda9fa13d8..0105c9f985 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/conductor/rpcapi.py b/ironic/conductor/rpcapi.py index 65481af2bb..eb184fcb8c 100644 --- a/ironic/conductor/rpcapi.py +++ b/ironic/conductor/rpcapi.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/conductor/task_manager.py b/ironic/conductor/task_manager.py index 2c8d5fb982..97c638d09f 100644 --- a/ironic/conductor/task_manager.py +++ b/ironic/conductor/task_manager.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py index 627adbdc33..b0b8815475 100644 --- a/ironic/conductor/utils.py +++ b/ironic/conductor/utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/db/api.py b/ironic/db/api.py index 586564c41e..59c014ddba 100644 --- a/ironic/db/api.py +++ b/ironic/db/api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/db/migration.py b/ironic/db/migration.py index d4f22508ad..57692d64de 100644 --- a/ironic/db/migration.py +++ b/ironic/db/migration.py @@ -1,5 +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. diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py index a6713c7615..a56186ccd5 100644 --- a/ironic/db/sqlalchemy/api.py +++ b/ironic/db/sqlalchemy/api.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/db/sqlalchemy/migration.py b/ironic/db/sqlalchemy/migration.py index 1fb7330724..91276a9def 100644 --- a/ironic/db/sqlalchemy/migration.py +++ b/ironic/db/sqlalchemy/migration.py @@ -1,5 +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. diff --git a/ironic/db/sqlalchemy/models.py b/ironic/db/sqlalchemy/models.py index 18d34a785f..c15625e89e 100644 --- a/ironic/db/sqlalchemy/models.py +++ b/ironic/db/sqlalchemy/models.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/drivers/base.py b/ironic/drivers/base.py index 7381a09569..ad6af2dc0f 100644 --- a/ironic/drivers/base.py +++ b/ironic/drivers/base.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/drivers/fake.py b/ironic/drivers/fake.py index ab3f3404c5..9d65a25a8d 100644 --- a/ironic/drivers/fake.py +++ b/ironic/drivers/fake.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/drivers/modules/fake.py b/ironic/drivers/modules/fake.py index cf832c5a8d..c2455dd680 100644 --- a/ironic/drivers/modules/fake.py +++ b/ironic/drivers/modules/fake.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/drivers/modules/ipminative.py b/ironic/drivers/modules/ipminative.py index 801b4a5a71..e4279a4cd9 100644 --- a/ironic/drivers/modules/ipminative.py +++ b/ironic/drivers/modules/ipminative.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 International Business Machines Corporation diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py index c46f329815..e0398544b6 100644 --- a/ironic/drivers/modules/ipmitool.py +++ b/ironic/drivers/modules/ipmitool.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2012 Hewlett-Packard Development Company, L.P. diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py index dae8c999fb..ec78a675e6 100644 --- a/ironic/drivers/modules/pxe.py +++ b/ironic/drivers/modules/pxe.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/drivers/modules/ssh.py b/ironic/drivers/modules/ssh.py index 23085ce192..ac01bede89 100644 --- a/ironic/drivers/modules/ssh.py +++ b/ironic/drivers/modules/ssh.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/drivers/pxe.py b/ironic/drivers/pxe.py index 4cb1bd52cd..e39efb8685 100644 --- a/ironic/drivers/pxe.py +++ b/ironic/drivers/pxe.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/netconf.py b/ironic/netconf.py index ddff0f7a55..fcea24c2d1 100644 --- a/ironic/netconf.py +++ b/ironic/netconf.py @@ -1,5 +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. diff --git a/ironic/objects/chassis.py b/ironic/objects/chassis.py index 472fdb119a..239c9199b6 100644 --- a/ironic/objects/chassis.py +++ b/ironic/objects/chassis.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # # diff --git a/ironic/objects/conductor.py b/ironic/objects/conductor.py index f7631c4944..eea10c7625 100644 --- a/ironic/objects/conductor.py +++ b/ironic/objects/conductor.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/objects/node.py b/ironic/objects/node.py index b2a3ce5489..4d26c10d4c 100644 --- a/ironic/objects/node.py +++ b/ironic/objects/node.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # # diff --git a/ironic/objects/port.py b/ironic/objects/port.py index 71a03b8884..07c400e2a9 100644 --- a/ironic/objects/port.py +++ b/ironic/objects/port.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # # diff --git a/ironic/tests/__init__.py b/ironic/tests/__init__.py index 77c15eed61..e45f578f1c 100644 --- a/ironic/tests/__init__.py +++ b/ironic/tests/__init__.py @@ -1,5 +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. diff --git a/ironic/tests/api/base.py b/ironic/tests/api/base.py index 2a1add4368..09004a9809 100644 --- a/ironic/tests/api/base.py +++ b/ironic/tests/api/base.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/api/test_acl.py b/ironic/tests/api/test_acl.py index 8b94a383d6..144f7d9935 100644 --- a/ironic/tests/api/test_acl.py +++ b/ironic/tests/api/test_acl.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/tests/api/test_base.py b/ironic/tests/api/test_base.py index eff0505b70..e7557ebcd7 100644 --- a/ironic/tests/api/test_base.py +++ b/ironic/tests/api/test_base.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/tests/api/test_chassis.py b/ironic/tests/api/test_chassis.py index d7c4a070c7..86796b1aa4 100644 --- a/ironic/tests/api/test_chassis.py +++ b/ironic/tests/api/test_chassis.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/tests/api/test_drivers.py b/ironic/tests/api/test_drivers.py index 042ea87ba4..f832ab675d 100644 --- a/ironic/tests/api/test_drivers.py +++ b/ironic/tests/api/test_drivers.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/tests/api/test_hooks.py b/ironic/tests/api/test_hooks.py index a1d860d083..4b70a35388 100644 --- a/ironic/tests/api/test_hooks.py +++ b/ironic/tests/api/test_hooks.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/tests/api/test_nodes.py b/ironic/tests/api/test_nodes.py index ab22c67e87..4bdc3c95be 100644 --- a/ironic/tests/api/test_nodes.py +++ b/ironic/tests/api/test_nodes.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/tests/api/test_ports.py b/ironic/tests/api/test_ports.py index 03aca9ae56..483712567e 100644 --- a/ironic/tests/api/test_ports.py +++ b/ironic/tests/api/test_ports.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/tests/api/test_root.py b/ironic/tests/api/test_root.py index 7ba5b2a6cf..a1f6030b71 100644 --- a/ironic/tests/api/test_root.py +++ b/ironic/tests/api/test_root.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/tests/api/test_types.py b/ironic/tests/api/test_types.py index a878920870..edaac1c2be 100644 --- a/ironic/tests/api/test_types.py +++ b/ironic/tests/api/test_types.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding: utf-8 # # Copyright 2013 Red Hat, Inc. diff --git a/ironic/tests/api/test_utils.py b/ironic/tests/api/test_utils.py index 2e089b7d09..965f130d2a 100644 --- a/ironic/tests/api/test_utils.py +++ b/ironic/tests/api/test_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/tests/api/utils.py b/ironic/tests/api/utils.py index 3a1dbff06e..c86e25cdc7 100644 --- a/ironic/tests/api/utils.py +++ b/ironic/tests/api/utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/tests/base.py b/ironic/tests/base.py index 21515a7831..23a24014ce 100644 --- a/ironic/tests/base.py +++ b/ironic/tests/base.py @@ -1,5 +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. diff --git a/ironic/tests/conductor/test_conductor_utils.py b/ironic/tests/conductor/test_conductor_utils.py index 30dc0ea34e..a82c92c41b 100644 --- a/ironic/tests/conductor/test_conductor_utils.py +++ b/ironic/tests/conductor/test_conductor_utils.py @@ -1,5 +1,3 @@ -# 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 diff --git a/ironic/tests/conductor/test_manager.py b/ironic/tests/conductor/test_manager.py index 55ebf9f198..27eac9723b 100644 --- a/ironic/tests/conductor/test_manager.py +++ b/ironic/tests/conductor/test_manager.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/conductor/test_rpcapi.py b/ironic/tests/conductor/test_rpcapi.py index de70f62ffc..e8c9f3f472 100644 --- a/ironic/tests/conductor/test_rpcapi.py +++ b/ironic/tests/conductor/test_rpcapi.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/conductor/test_task_manager.py b/ironic/tests/conductor/test_task_manager.py index c0f7867bec..41be2b1ce6 100644 --- a/ironic/tests/conductor/test_task_manager.py +++ b/ironic/tests/conductor/test_task_manager.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/conductor/test_utils.py b/ironic/tests/conductor/test_utils.py index e9b6d024e0..cfbfe04cdc 100644 --- a/ironic/tests/conductor/test_utils.py +++ b/ironic/tests/conductor/test_utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/conductor/utils.py b/ironic/tests/conductor/utils.py index b810643a94..66fcee8b68 100644 --- a/ironic/tests/conductor/utils.py +++ b/ironic/tests/conductor/utils.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/conf_fixture.py b/ironic/tests/conf_fixture.py index e9ef9baa76..1c5c18e506 100644 --- a/ironic/tests/conf_fixture.py +++ b/ironic/tests/conf_fixture.py @@ -1,5 +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. diff --git a/ironic/tests/db/sqlalchemy/test_migrations.py b/ironic/tests/db/sqlalchemy/test_migrations.py index 10fe58e494..4f73e5d25d 100644 --- a/ironic/tests/db/sqlalchemy/test_migrations.py +++ b/ironic/tests/db/sqlalchemy/test_migrations.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2010-2011 OpenStack Foundation # Copyright 2012-2013 IBM Corp. # All Rights Reserved. diff --git a/ironic/tests/db/test_chassis.py b/ironic/tests/db/test_chassis.py index 3e86172c9c..c0ad8d0faa 100644 --- a/ironic/tests/db/test_chassis.py +++ b/ironic/tests/db/test_chassis.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/tests/db/test_conductor.py b/ironic/tests/db/test_conductor.py index 9ef5e95a8d..c392287652 100644 --- a/ironic/tests/db/test_conductor.py +++ b/ironic/tests/db/test_conductor.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/tests/db/test_nodes.py b/ironic/tests/db/test_nodes.py index 20fb0aafa1..3c9559724e 100644 --- a/ironic/tests/db/test_nodes.py +++ b/ironic/tests/db/test_nodes.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/tests/db/test_ports.py b/ironic/tests/db/test_ports.py index 40299e52f4..7c65488668 100644 --- a/ironic/tests/db/test_ports.py +++ b/ironic/tests/db/test_ports.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/tests/db/utils.py b/ironic/tests/db/utils.py index 9681ecdc25..209abed9d2 100644 --- a/ironic/tests/db/utils.py +++ b/ironic/tests/db/utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/tests/drivers/test_deploy_utils.py b/ironic/tests/drivers/test_deploy_utils.py index c0e6f80909..621916465d 100644 --- a/ironic/tests/drivers/test_deploy_utils.py +++ b/ironic/tests/drivers/test_deploy_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 NTT DOCOMO, INC. # Copyright 2011 OpenStack Foundation # Copyright 2011 Ilya Alekseyev diff --git a/ironic/tests/drivers/test_fake.py b/ironic/tests/drivers/test_fake.py index 6b48a69ca6..5ed55ce393 100644 --- a/ironic/tests/drivers/test_fake.py +++ b/ironic/tests/drivers/test_fake.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/drivers/test_ipminative.py b/ironic/tests/drivers/test_ipminative.py index dcb9fd9f44..29d2d6bd5c 100644 --- a/ironic/tests/drivers/test_ipminative.py +++ b/ironic/tests/drivers/test_ipminative.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 International Business Machines Corporation diff --git a/ironic/tests/drivers/test_ipmitool.py b/ironic/tests/drivers/test_ipmitool.py index 20d956fb96..1e4edf23d0 100644 --- a/ironic/tests/drivers/test_ipmitool.py +++ b/ironic/tests/drivers/test_ipmitool.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2012 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/drivers/test_pxe.py b/ironic/tests/drivers/test_pxe.py index 2bec21ff10..b4b1c194db 100644 --- a/ironic/tests/drivers/test_pxe.py +++ b/ironic/tests/drivers/test_pxe.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/fake_policy.py b/ironic/tests/fake_policy.py index 3851966b19..ccd40e3259 100644 --- a/ironic/tests/fake_policy.py +++ b/ironic/tests/fake_policy.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2012 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/tests/matchers.py b/ironic/tests/matchers.py index dca69035fc..1c8207a767 100644 --- a/ironic/tests/matchers.py +++ b/ironic/tests/matchers.py @@ -1,5 +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. # Copyright 2012 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/objects/test_chassis.py b/ironic/tests/objects/test_chassis.py index e95c72f447..16a79a214e 100644 --- a/ironic/tests/objects/test_chassis.py +++ b/ironic/tests/objects/test_chassis.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # # diff --git a/ironic/tests/objects/test_conductor.py b/ironic/tests/objects/test_conductor.py index 8d92e115d6..8b0139668f 100644 --- a/ironic/tests/objects/test_conductor.py +++ b/ironic/tests/objects/test_conductor.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # # Copyright 2013 Hewlett-Packard Development Company, L.P. diff --git a/ironic/tests/objects/test_node.py b/ironic/tests/objects/test_node.py index 8f28e8b48f..425fa1c353 100644 --- a/ironic/tests/objects/test_node.py +++ b/ironic/tests/objects/test_node.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # # diff --git a/ironic/tests/objects/test_port.py b/ironic/tests/objects/test_port.py index 8f4886494f..f26dcf61b3 100644 --- a/ironic/tests/objects/test_port.py +++ b/ironic/tests/objects/test_port.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # coding=utf-8 # # diff --git a/ironic/tests/stubs.py b/ironic/tests/stubs.py index 2fcc19d408..69d797a528 100644 --- a/ironic/tests/stubs.py +++ b/ironic/tests/stubs.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 Citrix Systems, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/tests/test_dbsync.py b/ironic/tests/test_dbsync.py index 711a2105b0..5b66451f5e 100644 --- a/ironic/tests/test_dbsync.py +++ b/ironic/tests/test_dbsync.py @@ -1,8 +1,5 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/tests/test_glance_service.py b/ironic/tests/test_glance_service.py index e416c7a5f7..5ef670de5e 100644 --- a/ironic/tests/test_glance_service.py +++ b/ironic/tests/test_glance_service.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/tests/test_hash_ring.py b/ironic/tests/test_hash_ring.py index 1ccb3554c1..3b09f28c51 100644 --- a/ironic/tests/test_hash_ring.py +++ b/ironic/tests/test_hash_ring.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 Hewlett-Packard Development Company, L.P. # All Rights Reserved. # diff --git a/ironic/tests/test_keystone.py b/ironic/tests/test_keystone.py index 75fb41020f..fa9eefbbe9 100644 --- a/ironic/tests/test_keystone.py +++ b/ironic/tests/test_keystone.py @@ -1,4 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/ironic/tests/test_policy.py b/ironic/tests/test_policy.py index 70e02fa217..401a560183 100644 --- a/ironic/tests/test_policy.py +++ b/ironic/tests/test_policy.py @@ -1,8 +1,5 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 # -*- encoding: utf-8 -*- # -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# # Copyright 2013 Red Hat, Inc. # All Rights Reserved. # diff --git a/ironic/tests/test_utils.py b/ironic/tests/test_utils.py index 799bb040d8..10cd26df3d 100644 --- a/ironic/tests/test_utils.py +++ b/ironic/tests/test_utils.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 Justin Santa Barbara # Copyright 2012 Hewlett-Packard Development Company, L.P. # diff --git a/ironic/version.py b/ironic/version.py index 743941f20d..6dd2b95a93 100644 --- a/ironic/version.py +++ b/ironic/version.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # All Rights Reserved. # diff --git a/tools/install_venv_common.py b/tools/install_venv_common.py index b5ec5092f0..3e8c1e4a81 100644 --- a/tools/install_venv_common.py +++ b/tools/install_venv_common.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2013 OpenStack Foundation # Copyright 2013 IBM Corp. #