From fce23f7646335015ab77f109ce5bbbc43e68c0b0 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Sun, 5 Jan 2020 14:07:37 +0000
Subject: [PATCH] lint: enabled whitespace fixes

Adds two checks that were used in order repos (liketq)but not on this
one.

Change-Id: I4ccaf3dc78777b4b661fa17382f2feef8eb0d03e
---
 .pre-commit-config.yaml                                       | 4 +++-
 LICENSE                                                       | 1 -
 config/environments/rdocloud-ci.yml.example                   | 1 -
 roles/baremetal-prep-overcloud/README.md                      | 1 -
 roles/baremetal-prep-overcloud/tests/inventory                | 2 +-
 roles/baremetal-prep-virthost/tests/inventory                 | 2 +-
 .../templates/reproducer-fresh-box-setup.sh.j2                | 1 -
 roles/extras-common/README.md                                 | 2 +-
 roles/freeipa-setup/templates/deploy_freeipa.sh.j2            | 1 -
 roles/ovb-manage-stack/README.md                              | 1 -
 roles/ovb-manage-stack/templates/clouds.yaml.j2               | 1 -
 roles/overcloud-deploy/docs/contributing.md                   | 1 -
 roles/overcloud-deploy/templates/hostnamemap.yaml.j2          | 2 +-
 .../templates/overcloud_baremetal_deploy.yaml.j2              | 2 +-
 roles/overcloud-deploy/templates/overcloud_services.yaml.j2   | 1 -
 .../templates/overcloud_storage_params.yaml.j2                | 2 --
 roles/overcloud-deploy/tests/inventory                        | 2 +-
 .../templates/bond-with-vlans-copy-nic-configs.sh.j2          | 1 -
 roles/overcloud-prep-flavors/README.md                        | 1 -
 roles/overcloud-prep-images/README.md                         | 1 -
 roles/overcloud-prep-network/README.md                        | 1 -
 roles/overcloud-ssl/tests/inventory                           | 2 +-
 .../templates/run-postdep-validations-negative-tests.sh.j2    | 1 -
 .../templates/run-predep-validations-negative-tests.sh.j2     | 1 -
 .../templates/run-preintro-validations-negative-tests.sh.j2   | 1 -
 .../templates/run-tripleo-validations.sh.j2                   | 1 -
 roles/undercloud-setup/README.md                              | 1 -
 roles/validate-ipmi/tests/inventory                           | 2 +-
 roles/validate-sanity-checks/README.md                        | 2 --
 roles/validate-tempest/files/check-skip-list/requirements.txt | 2 +-
 roles/validate-tempest/files/tempestmail/README.md            | 1 -
 .../validate-tempest/files/tempestmail/template/template.html | 1 -
 .../files/tempestmail/tests/fixtures/console_fail.log         | 1 -
 .../files/tempestmail/tests/fixtures/content_job.html         | 1 -
 .../files/tempestmail/tests/fixtures/template.html            | 1 -
 roles/validate-tempest/templates/skip_file.j2                 | 1 -
 roles/virthost-full-cleanup/tests/inventory                   | 2 +-
 37 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e23560e39..8e5a0c33a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,13 +1,15 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v2.4.0
     hooks:
+      - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: mixed-line-ending
       - id: check-byte-order-marker
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
+      - id: check-symlinks
       - id: debug-statements
       - id: flake8
         additional_dependencies:
diff --git a/LICENSE b/LICENSE
index 8f71f43fe..8dada3eda 100644
--- a/LICENSE
+++ b/LICENSE
@@ -199,4 +199,3 @@
    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.
-
diff --git a/config/environments/rdocloud-ci.yml.example b/config/environments/rdocloud-ci.yml.example
index 441536093..22de5ce72 100644
--- a/config/environments/rdocloud-ci.yml.example
+++ b/config/environments/rdocloud-ci.yml.example
@@ -37,4 +37,3 @@ mtu_interface:
 
 undercloud_local_mtu: "{{ mtu }}"
 overcloud_neutron_global_physnet_mtu: "{{ mtu }}"
-
diff --git a/roles/baremetal-prep-overcloud/README.md b/roles/baremetal-prep-overcloud/README.md
index 05dbbcfb7..9a5261063 100644
--- a/roles/baremetal-prep-overcloud/README.md
+++ b/roles/baremetal-prep-overcloud/README.md
@@ -47,4 +47,3 @@ Author Information
 ------------------
 
 RDO-CI Team
-
diff --git a/roles/baremetal-prep-overcloud/tests/inventory b/roles/baremetal-prep-overcloud/tests/inventory
index d18580b3c..2fbb50c4a 100644
--- a/roles/baremetal-prep-overcloud/tests/inventory
+++ b/roles/baremetal-prep-overcloud/tests/inventory
@@ -1 +1 @@
-localhost
\ No newline at end of file
+localhost
diff --git a/roles/baremetal-prep-virthost/tests/inventory b/roles/baremetal-prep-virthost/tests/inventory
index d18580b3c..2fbb50c4a 100644
--- a/roles/baremetal-prep-virthost/tests/inventory
+++ b/roles/baremetal-prep-virthost/tests/inventory
@@ -1 +1 @@
-localhost
\ No newline at end of file
+localhost
diff --git a/roles/create-zuul-based-reproducer/templates/reproducer-fresh-box-setup.sh.j2 b/roles/create-zuul-based-reproducer/templates/reproducer-fresh-box-setup.sh.j2
index 0ec341108..bf491617b 100644
--- a/roles/create-zuul-based-reproducer/templates/reproducer-fresh-box-setup.sh.j2
+++ b/roles/create-zuul-based-reproducer/templates/reproducer-fresh-box-setup.sh.j2
@@ -124,4 +124,3 @@ echo "to run the reproducer. Here is the public key you must upload:"
 sudo cat /home/$REPRO_USER/.ssh/id_rsa.pub
 echo "Switching to $REPRO_USER"
 sudo su - $REPRO_USER
-
diff --git a/roles/extras-common/README.md b/roles/extras-common/README.md
index eb5cf329e..8453018fa 100644
--- a/roles/extras-common/README.md
+++ b/roles/extras-common/README.md
@@ -45,4 +45,4 @@ Role Variables
 - `undercloud_rpm_dependencies`: <'python-tripleoclient'> -- Dependency packages for undercloud deployments.
 - `baremetal_provision`: <false> Deploy baremetal with "openstack overcloud node provision" and deployed-server, instead of with heat/nova
 - `undercloud_enable_nova`: <true> -- sets up the 'enable_nova'
-  option in undercloud.conf.
\ No newline at end of file
+  option in undercloud.conf.
diff --git a/roles/freeipa-setup/templates/deploy_freeipa.sh.j2 b/roles/freeipa-setup/templates/deploy_freeipa.sh.j2
index 3d5cce50a..739e2000b 100644
--- a/roles/freeipa-setup/templates/deploy_freeipa.sh.j2
+++ b/roles/freeipa-setup/templates/deploy_freeipa.sh.j2
@@ -106,4 +106,3 @@ iptables-restore < freeipa-iptables-rules.txt
 {% endfor %}
 
 ### ---stop_docs
-
diff --git a/roles/ovb-manage-stack/README.md b/roles/ovb-manage-stack/README.md
index 416259988..ccdf00cba 100644
--- a/roles/ovb-manage-stack/README.md
+++ b/roles/ovb-manage-stack/README.md
@@ -82,4 +82,3 @@ Author Information
 ------------------
 
 RDO-CI Team
-
diff --git a/roles/ovb-manage-stack/templates/clouds.yaml.j2 b/roles/ovb-manage-stack/templates/clouds.yaml.j2
index 0830292a8..32d26a962 100644
--- a/roles/ovb-manage-stack/templates/clouds.yaml.j2
+++ b/roles/ovb-manage-stack/templates/clouds.yaml.j2
@@ -6,4 +6,3 @@ clouds:
       project_name: {{ os_tenant_name }}
       auth_url: {{ os_auth_url }}
     region_name: {{ os_region_name }}
-
diff --git a/roles/overcloud-deploy/docs/contributing.md b/roles/overcloud-deploy/docs/contributing.md
index 3fc5e1c68..cb06e9c2e 100644
--- a/roles/overcloud-deploy/docs/contributing.md
+++ b/roles/overcloud-deploy/docs/contributing.md
@@ -40,4 +40,3 @@ After committing your changes, resubmit the review:
 
 [gerrit]: https://docs.openstack.org/infra/manual/developers.html#development-workflow
 [git-review]: https://docs.openstack.org/infra/manual/developers.html#installing-git-review
-
diff --git a/roles/overcloud-deploy/templates/hostnamemap.yaml.j2 b/roles/overcloud-deploy/templates/hostnamemap.yaml.j2
index 54c55a3d8..9215edcab 100644
--- a/roles/overcloud-deploy/templates/hostnamemap.yaml.j2
+++ b/roles/overcloud-deploy/templates/hostnamemap.yaml.j2
@@ -4,4 +4,4 @@ parameter_defaults:
 {% if node.hostnamemap_override is defined %}
     {{ node.default_name }}: {{ node.hostnamemap_override }}
 {% endif %}
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/roles/overcloud-deploy/templates/overcloud_baremetal_deploy.yaml.j2 b/roles/overcloud-deploy/templates/overcloud_baremetal_deploy.yaml.j2
index e7dd80d01..7daeca4ee 100644
--- a/roles/overcloud-deploy/templates/overcloud_baremetal_deploy.yaml.j2
+++ b/roles/overcloud-deploy/templates/overcloud_baremetal_deploy.yaml.j2
@@ -8,4 +8,4 @@
   profile: {{ role_profile }}
 {% endif %}
 {% endif %}
-{% endfor %}
\ No newline at end of file
+{% endfor %}
diff --git a/roles/overcloud-deploy/templates/overcloud_services.yaml.j2 b/roles/overcloud-deploy/templates/overcloud_services.yaml.j2
index de0b861e6..9e2c95dba 100644
--- a/roles/overcloud-deploy/templates/overcloud_services.yaml.j2
+++ b/roles/overcloud-deploy/templates/overcloud_services.yaml.j2
@@ -5,4 +5,3 @@ parameter_defaults:
     - {{ node }}
    {% endfor %}
 {% endfor %}
-
diff --git a/roles/overcloud-deploy/templates/overcloud_storage_params.yaml.j2 b/roles/overcloud-deploy/templates/overcloud_storage_params.yaml.j2
index ccb511406..340eec6bd 100644
--- a/roles/overcloud-deploy/templates/overcloud_storage_params.yaml.j2
+++ b/roles/overcloud-deploy/templates/overcloud_storage_params.yaml.j2
@@ -2,5 +2,3 @@
 
 parameter_defaults:
   CinderLVMLoopDeviceSize: {{ overcloud_cinder_lvm_loop_device_size }}
-
-
diff --git a/roles/overcloud-deploy/tests/inventory b/roles/overcloud-deploy/tests/inventory
index d18580b3c..2fbb50c4a 100644
--- a/roles/overcloud-deploy/tests/inventory
+++ b/roles/overcloud-deploy/tests/inventory
@@ -1 +1 @@
-localhost
\ No newline at end of file
+localhost
diff --git a/roles/overcloud-prep-config/templates/bond-with-vlans-copy-nic-configs.sh.j2 b/roles/overcloud-prep-config/templates/bond-with-vlans-copy-nic-configs.sh.j2
index e95bf14a5..916c689ec 100644
--- a/roles/overcloud-prep-config/templates/bond-with-vlans-copy-nic-configs.sh.j2
+++ b/roles/overcloud-prep-config/templates/bond-with-vlans-copy-nic-configs.sh.j2
@@ -24,4 +24,3 @@ sudo grep -rl 'type: ovs_bond' $CUSTOM_TEMPLATES_DIR/ | xargs sudo sed -i 's/typ
 sudo grep -rl 'ovs_options' $CUSTOM_TEMPLATES_DIR/ | xargs sudo sed -i 's/ovs_options/bonding_options/g'
 
 ### --stop_docs
-
diff --git a/roles/overcloud-prep-flavors/README.md b/roles/overcloud-prep-flavors/README.md
index c833754cf..3a0abfd7f 100644
--- a/roles/overcloud-prep-flavors/README.md
+++ b/roles/overcloud-prep-flavors/README.md
@@ -43,4 +43,3 @@ Author Information
 ------------------
 
 RDO-CI Team
-
diff --git a/roles/overcloud-prep-images/README.md b/roles/overcloud-prep-images/README.md
index f6ed14331..087b8ceb5 100644
--- a/roles/overcloud-prep-images/README.md
+++ b/roles/overcloud-prep-images/README.md
@@ -60,4 +60,3 @@ Author Information
 ------------------
 
 RDO-CI Team
-
diff --git a/roles/overcloud-prep-network/README.md b/roles/overcloud-prep-network/README.md
index 88da2e3fd..7867e5aa4 100644
--- a/roles/overcloud-prep-network/README.md
+++ b/roles/overcloud-prep-network/README.md
@@ -89,4 +89,3 @@ Author Information
 ------------------
 
 RDO-CI Team
-
diff --git a/roles/overcloud-ssl/tests/inventory b/roles/overcloud-ssl/tests/inventory
index d18580b3c..2fbb50c4a 100644
--- a/roles/overcloud-ssl/tests/inventory
+++ b/roles/overcloud-ssl/tests/inventory
@@ -1 +1 @@
-localhost
\ No newline at end of file
+localhost
diff --git a/roles/tripleo-validations/templates/run-postdep-validations-negative-tests.sh.j2 b/roles/tripleo-validations/templates/run-postdep-validations-negative-tests.sh.j2
index 0b1840c3b..f85acc022 100755
--- a/roles/tripleo-validations/templates/run-postdep-validations-negative-tests.sh.j2
+++ b/roles/tripleo-validations/templates/run-postdep-validations-negative-tests.sh.j2
@@ -37,4 +37,3 @@ ANSIBLE_INVENTORY_BIN=$(which tripleo-ansible-inventory)
 # TODO(gchamoul) add negative tests for post-deployment validations
 
 ## --stop_docs
-
diff --git a/roles/tripleo-validations/templates/run-predep-validations-negative-tests.sh.j2 b/roles/tripleo-validations/templates/run-predep-validations-negative-tests.sh.j2
index 6b286db5d..a1b5eb326 100755
--- a/roles/tripleo-validations/templates/run-predep-validations-negative-tests.sh.j2
+++ b/roles/tripleo-validations/templates/run-predep-validations-negative-tests.sh.j2
@@ -37,4 +37,3 @@ ANSIBLE_INVENTORY_BIN=$(which tripleo-ansible-inventory)
 # TODO(gchamoul) add negative tests for pre-deployment validations
 
 ## --stop_docs
-
diff --git a/roles/tripleo-validations/templates/run-preintro-validations-negative-tests.sh.j2 b/roles/tripleo-validations/templates/run-preintro-validations-negative-tests.sh.j2
index edbe9bf30..b3dc162f3 100755
--- a/roles/tripleo-validations/templates/run-preintro-validations-negative-tests.sh.j2
+++ b/roles/tripleo-validations/templates/run-preintro-validations-negative-tests.sh.j2
@@ -184,4 +184,3 @@ run_undercloud_cpu
 run_undercloud_disk_space
 
 ## --stop_docs
-
diff --git a/roles/tripleo-validations/templates/run-tripleo-validations.sh.j2 b/roles/tripleo-validations/templates/run-tripleo-validations.sh.j2
index bbe80531f..d841cd744 100755
--- a/roles/tripleo-validations/templates/run-tripleo-validations.sh.j2
+++ b/roles/tripleo-validations/templates/run-tripleo-validations.sh.j2
@@ -64,4 +64,3 @@ for validation_name in $LIST_VALIDATIONS; do
 done
 
 ## --stop_docs
-
diff --git a/roles/undercloud-setup/README.md b/roles/undercloud-setup/README.md
index fd7fe3531..1b277359f 100644
--- a/roles/undercloud-setup/README.md
+++ b/roles/undercloud-setup/README.md
@@ -71,4 +71,3 @@ Author Information
 ------------------
 
 RDO-CI Team
-
diff --git a/roles/validate-ipmi/tests/inventory b/roles/validate-ipmi/tests/inventory
index d18580b3c..2fbb50c4a 100644
--- a/roles/validate-ipmi/tests/inventory
+++ b/roles/validate-ipmi/tests/inventory
@@ -1 +1 @@
-localhost
\ No newline at end of file
+localhost
diff --git a/roles/validate-sanity-checks/README.md b/roles/validate-sanity-checks/README.md
index f3573c9bb..27aa33b03 100644
--- a/roles/validate-sanity-checks/README.md
+++ b/roles/validate-sanity-checks/README.md
@@ -46,5 +46,3 @@ Author Information
 ------------------
 
 TripleO CI Team
-
-
diff --git a/roles/validate-tempest/files/check-skip-list/requirements.txt b/roles/validate-tempest/files/check-skip-list/requirements.txt
index a7769eccd..6c9fdba97 100644
--- a/roles/validate-tempest/files/check-skip-list/requirements.txt
+++ b/roles/validate-tempest/files/check-skip-list/requirements.txt
@@ -1,2 +1,2 @@
 PyYAML
-requests
\ No newline at end of file
+requests
diff --git a/roles/validate-tempest/files/tempestmail/README.md b/roles/validate-tempest/files/tempestmail/README.md
index 080877e87..81a618c8d 100644
--- a/roles/validate-tempest/files/tempestmail/README.md
+++ b/roles/validate-tempest/files/tempestmail/README.md
@@ -199,4 +199,3 @@ Tests
 -----
 
 [user@localhost tempestmail]$ python -m unittest discover -v
-
diff --git a/roles/validate-tempest/files/tempestmail/template/template.html b/roles/validate-tempest/files/tempestmail/template/template.html
index 79e4d61bd..cc16f6943 100644
--- a/roles/validate-tempest/files/tempestmail/template/template.html
+++ b/roles/validate-tempest/files/tempestmail/template/template.html
@@ -51,4 +51,3 @@
     <p>We also have a <a href="http://cistatus.tripleo.org/">website with status of our current jobs</a> if you are interested.</p>
     </body>
 </html>
-
diff --git a/roles/validate-tempest/files/tempestmail/tests/fixtures/console_fail.log b/roles/validate-tempest/files/tempestmail/tests/fixtures/console_fail.log
index c95938c37..f580bfa79 100644
--- a/roles/validate-tempest/files/tempestmail/tests/fixtures/console_fail.log
+++ b/roles/validate-tempest/files/tempestmail/tests/fixtures/console_fail.log
@@ -1,3 +1,2 @@
 2017-01-18 08:51:03.877973 | {0} tempest.api.object_storage.test_container_quotas.ContainerQuotasTest.test_upload_valid_object [0.263364s] ... FAILED
 2017-01-18 08:51:46.676254 | {1} tempest.api.orchestration.stacks.test_soft_conf.TestSoftwareConfig.test_get_deployment_metadata [0.899338s] ... FAILED
-
diff --git a/roles/validate-tempest/files/tempestmail/tests/fixtures/content_job.html b/roles/validate-tempest/files/tempestmail/tests/fixtures/content_job.html
index 277e57bcd..ecd96aed8 100644
--- a/roles/validate-tempest/files/tempestmail/tests/fixtures/content_job.html
+++ b/roles/validate-tempest/files/tempestmail/tests/fixtures/content_job.html
@@ -48,4 +48,3 @@
    <tr><th colspan="5"><hr></th></tr>
 </table>
 </body></html>
-
diff --git a/roles/validate-tempest/files/tempestmail/tests/fixtures/template.html b/roles/validate-tempest/files/tempestmail/tests/fixtures/template.html
index 8b25c4cd3..53e8ffde6 100644
--- a/roles/validate-tempest/files/tempestmail/tests/fixtures/template.html
+++ b/roles/validate-tempest/files/tempestmail/tests/fixtures/template.html
@@ -35,4 +35,3 @@
     <p>
     </body>
 </html>
-
diff --git a/roles/validate-tempest/templates/skip_file.j2 b/roles/validate-tempest/templates/skip_file.j2
index b9f251bce..a16c814d9 100644
--- a/roles/validate-tempest/templates/skip_file.j2
+++ b/roles/validate-tempest/templates/skip_file.j2
@@ -48,4 +48,3 @@
 {% endif %}
 {% endfor %}
 {% endif %}
-
diff --git a/roles/virthost-full-cleanup/tests/inventory b/roles/virthost-full-cleanup/tests/inventory
index d18580b3c..2fbb50c4a 100644
--- a/roles/virthost-full-cleanup/tests/inventory
+++ b/roles/virthost-full-cleanup/tests/inventory
@@ -1 +1 @@
-localhost
\ No newline at end of file
+localhost