Address pre-commit issues

We'd like to use pre-commit as our 'pep8' target. Before we do that, we
need to address some issues that have crept in over the time since
pre-commit was first added.

Change-Id: I3bb383a00a44007eaa241e037e38aea16bd517b2
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>

8 files changed, 52 insertions, 53 deletions

diff --git a/doc/source/cli/data/keystone.csv b/doc/source/cli/data/keystone.csv
index bcc30551..2a7e7f56 100644
--- a/doc/source/cli/data/keystone.csv
+++ b/doc/source/cli/data/keystone.csv
@@ -1,37 +1,37 @@
-catalog,catalog show,"List service catalog, possibly filtered by service."

-ec2-credentials-create,ec2 credentials create,Create EC2-compatible credentials for user per tenant.

-ec2-credentials-delete,ec2 credentials delete,Delete EC2-compatible credentials.

-ec2-credentials-get,ec2 credentials show,Display EC2-compatible credentials.

-ec2-credentials-list,ec2 credentials list,List EC2-compatible credentials for a user.

-endpoint-create,endpoint create,Create a new endpoint associated with a service.

-endpoint-delete,endpoint delete,Delete a service endpoint.

-endpoint-get,endpoint get,Find endpoint filtered by a specific attribute or service type.

-endpoint-list,endpoint list,List configured service endpoints.

-password-update,user password set,Update own password.

-role-create,role create,Create new role.

-role-delete,role delete,Delete role.

-role-get,role show,Display role details.

-role-list,role list,List all roles.

-service-create,service create,Add service to Service Catalog.

-service-delete,service delete,Delete service from Service Catalog.

-service-get,service show,Display service from Service Catalog.

-service-list,service list,List all services in Service Catalog.

-tenant-create,project create,Create new tenant.

-tenant-delete,project delete,Delete tenant.

-tenant-get,project show,Display tenant details.

-tenant-list,project list,List all tenants.

-tenant-update,project set,"Update tenant name, description, enabled status."

-token-get,token issue,Display the current user token.

-user-create,user create,Create new user.

-user-delete,user delete,Delete user.

-user-get,user show,Display user details.

-user-list,user list,List users.

-user-password-update,user set --password,Update user password.

-user-role-add,role add <role> --user --project,Add role to user.

-user-role-list,role assignment list --user --project,List roles granted to a user.

-user-role-remove,role remove <role> --user --project,Remove role from user.

-user-update,user set,"Update user's name, email, and enabled status."

-discover,WONTFIX,"Discover Keystone servers, supported API versions and extensions."

-bootstrap,WONTFIX,"Grants a new role to a new user on a new tenant, after creating each."

-bash-completion,complete,Prints all of the commands and options to stdout.

-help,help,Display help about this program or one of its subcommands.

+catalog,catalog show,"List service catalog, possibly filtered by service."
+ec2-credentials-create,ec2 credentials create,Create EC2-compatible credentials for user per tenant.
+ec2-credentials-delete,ec2 credentials delete,Delete EC2-compatible credentials.
+ec2-credentials-get,ec2 credentials show,Display EC2-compatible credentials.
+ec2-credentials-list,ec2 credentials list,List EC2-compatible credentials for a user.
+endpoint-create,endpoint create,Create a new endpoint associated with a service.
+endpoint-delete,endpoint delete,Delete a service endpoint.
+endpoint-get,endpoint get,Find endpoint filtered by a specific attribute or service type.
+endpoint-list,endpoint list,List configured service endpoints.
+password-update,user password set,Update own password.
+role-create,role create,Create new role.
+role-delete,role delete,Delete role.
+role-get,role show,Display role details.
+role-list,role list,List all roles.
+service-create,service create,Add service to Service Catalog.
+service-delete,service delete,Delete service from Service Catalog.
+service-get,service show,Display service from Service Catalog.
+service-list,service list,List all services in Service Catalog.
+tenant-create,project create,Create new tenant.
+tenant-delete,project delete,Delete tenant.
+tenant-get,project show,Display tenant details.
+tenant-list,project list,List all tenants.
+tenant-update,project set,"Update tenant name, description, enabled status."
+token-get,token issue,Display the current user token.
+user-create,user create,Create new user.
+user-delete,user delete,Delete user.
+user-get,user show,Display user details.
+user-list,user list,List users.
+user-password-update,user set --password,Update user password.
+user-role-add,role add <role> --user --project,Add role to user.
+user-role-list,role assignment list --user --project,List roles granted to a user.
+user-role-remove,role remove <role> --user --project,Remove role from user.
+user-update,user set,"Update user's name, email, and enabled status."
+discover,WONTFIX,"Discover Keystone servers, supported API versions and extensions."
+bootstrap,WONTFIX,"Grants a new role to a new user on a new tenant, after creating each."
+bash-completion,complete,Prints all of the commands and options to stdout.
+help,help,Display help about this program or one of its subcommands.
diff --git a/doc/source/cli/data/swift.csv b/doc/source/cli/data/swift.csv
index 68147412..87d781e2 100644
--- a/doc/source/cli/data/swift.csv
+++ b/doc/source/cli/data/swift.csv
@@ -1,10 +1,10 @@
-delete,object delete / container delete,Delete a container or objects within a container.

-download,object save / container save,Download objects from containers.

-list,object list / container list,Lists the containers for the account or the objects for a container.

-post,container create / object set / container set / object store account set,"Updates meta information for the account, container, or object."

-copy,,"Copies object, optionally adds meta."

-stat,object show / container show / object store account show,"Displays information for the account, container, or object."

-upload,object create,Uploads files or directories to the given container.

-capabilities,,List cluster capabilities.

-tempurl,,Create a temporary URL.

-auth,WONTFIX,Display auth related environment variables.

+delete,object delete / container delete,Delete a container or objects within a container.
+download,object save / container save,Download objects from containers.
+list,object list / container list,Lists the containers for the account or the objects for a container.
+post,container create / object set / container set / object store account set,"Updates meta information for the account, container, or object."
+copy,,"Copies object, optionally adds meta."
+stat,object show / container show / object store account show,"Displays information for the account, container, or object."
+upload,object create,Uploads files or directories to the given container.
+capabilities,,List cluster capabilities.
+tempurl,,Create a temporary URL.
+auth,WONTFIX,Display auth related environment variables.
diff --git a/releasenotes/notes/bp-add-locked-reason-425efd2def1144f1.yaml b/releasenotes/notes/bp-add-locked-reason-425efd2def1144f1.yaml
index e9f6cc6d..9ee03253 100644
--- a/releasenotes/notes/bp-add-locked-reason-425efd2def1144f1.yaml
+++ b/releasenotes/notes/bp-add-locked-reason-425efd2def1144f1.yaml
@@ -10,4 +10,3 @@ features:
     servers.
     Requires ``–os-compute-api-version`` 2.73 or greater.
     [Blueprint `add-locked-reason <https://blueprints.launchpad.net/nova/+spec/add-locked-reason>`_]
- 
\ No newline at end of file
diff --git a/releasenotes/notes/bp-neutron-floating-ip-rate-limit-8387c040a6fb9acd.yaml b/releasenotes/notes/bp-neutron-floating-ip-rate-limit-8387c040a6fb9acd.yaml
index d0aa9cd1..86f3da10 100644
--- a/releasenotes/notes/bp-neutron-floating-ip-rate-limit-8387c040a6fb9acd.yaml
+++ b/releasenotes/notes/bp-neutron-floating-ip-rate-limit-8387c040a6fb9acd.yaml
@@ -2,7 +2,7 @@
 features:
   - |
     Add support for attaching and removing qos policy to floating IPs.
-    
+
     Add option ``--qos-policy`` to the ``floating ip create`` and
     ``floating ip set`` commands to add qos policy to a floating IP.
 
diff --git a/releasenotes/notes/bp-project-tags-b544aef9672d415b.yaml b/releasenotes/notes/bp-project-tags-b544aef9672d415b.yaml
index 0da35ac3..2d3f519e 100644
--- a/releasenotes/notes/bp-project-tags-b544aef9672d415b.yaml
+++ b/releasenotes/notes/bp-project-tags-b544aef9672d415b.yaml
@@ -2,7 +2,7 @@
 features:
   - |
     Add ``--tag`` option to ``project create`` command,  ``--tag``, ``--clear-tags``, and
-    ``--remove-tag`` options to ``project set`` command. Add ``--tags``, ``--tags-any``, 
+    ``--remove-tag`` options to ``project set`` command. Add ``--tags``, ``--tags-any``,
     ``--not-tags``, and ``--not-tags-any`` options to ``project list`` command to filter
     list results by different projects based on their tags.
     [`blueprint project-tags <https://blueprints.launchpad.net/keystone/+spec/project-tags>`_]
diff --git a/releasenotes/notes/bug-1647406-c936581034a1b6e4.yaml b/releasenotes/notes/bug-1647406-c936581034a1b6e4.yaml
index 2f327517..29a4036a 100644
--- a/releasenotes/notes/bug-1647406-c936581034a1b6e4.yaml
+++ b/releasenotes/notes/bug-1647406-c936581034a1b6e4.yaml
@@ -9,7 +9,7 @@ fixes:
     The device name of the boot volume specificed in the ``--volume`` option
     is no longer assumed to be *'vda'* but now uses the hypervisor's boot
     index to obtain the device name.  This maintains the status quo for
-    **QEMU/KVM** hypervisors but **XEN**, **parallels** and others 
+    **QEMU/KVM** hypervisors but **XEN**, **parallels** and others
     *virt types* that have device naming is different from ``vd*``
     should now also work correctly.
     [:lpbug:`1497845`]
diff --git a/releasenotes/notes/floatingip_dns_integration-f26c7575694d098d.yaml b/releasenotes/notes/floatingip_dns_integration-f26c7575694d098d.yaml
index 9c1d4cf5..b730658a 100644
--- a/releasenotes/notes/floatingip_dns_integration-f26c7575694d098d.yaml
+++ b/releasenotes/notes/floatingip_dns_integration-f26c7575694d098d.yaml
@@ -1,7 +1,7 @@
 ---
 features:
   - |
-    Add ``--dns-domain`` and ``--dns-name`` options to the 
+    Add ``--dns-domain`` and ``--dns-name`` options to the
     ``floating ip create`` commands. These options
     set the DNS domain and name for the floating IP.
 
diff --git a/releasenotes/notes/osc4-identity-6564257c67d43106.yaml b/releasenotes/notes/osc4-identity-6564257c67d43106.yaml
index a5105c80..b352ee3e 100644
--- a/releasenotes/notes/osc4-identity-6564257c67d43106.yaml
+++ b/releasenotes/notes/osc4-identity-6564257c67d43106.yaml
@@ -7,6 +7,6 @@ upgrade:
     Remove deprecated ``user role list`` command.
     Use ``role assignment list`` options ``--project`` and ``--user`` instead.
   - |
-    Remove deprecated ``service create`` option ``--type``.  
+    Remove deprecated ``service create`` option ``--type``.
     The type is supplied as a positional argument in The
     ``service create --name <service-name> type`` command.