diff --git a/roles/instance-ha/tasks/apply.yml b/roles/instance-ha/tasks/apply.yml
index e2780da..d89fedd 100644
--- a/roles/instance-ha/tasks/apply.yml
+++ b/roles/instance-ha/tasks/apply.yml
@@ -1,8 +1,8 @@
 ---
 - name: Apply STONITH for compute nodes
-  include_role:                                                                 
+  include_role:
     name: stonith-config
-  vars:                                                                         
+  vars:
     stonith_devices: "computes"
 
 - name: Disable openstack-nova-compute on compute
diff --git a/roles/instance-ha/tasks/undo.yml b/roles/instance-ha/tasks/undo.yml
index 1fd174e..b65843f 100644
--- a/roles/instance-ha/tasks/undo.yml
+++ b/roles/instance-ha/tasks/undo.yml
@@ -176,8 +176,8 @@
     - "{{ groups['compute'] }}"
 
 - name: Undo STONITH for compute nodes
-  include_role:                                                                 
+  include_role:
     name: stonith-config
-  vars:                                                                         
+  vars:
     stonith_action: "uninstall"
     stonith_devices: "computes"
diff --git a/roles/stonith-config/defaults/main.yml b/roles/stonith-config/defaults/main.yml
index c0901a2..170d29c 100644
--- a/roles/stonith-config/defaults/main.yml
+++ b/roles/stonith-config/defaults/main.yml
@@ -7,7 +7,7 @@ instack_env_file: "{{ working_dir }}/instackenv.json"
 config_stonith_python_script: config-stonith-from-instackenv.py.j2
 
 # Can be install, uninstall or none
-stonith_action: "install"                                                     
+stonith_action: "install"
 
 # Can be all, controllers or computes
 stonith_devices: controllers
diff --git a/roles/validate-ha/defaults/main.yml b/roles/validate-ha/defaults/main.yml
index daa97d3..f628f0e 100644
--- a/roles/validate-ha/defaults/main.yml
+++ b/roles/validate-ha/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 
-working_dir: "/home/stack"                                                       
-validate_ha_logs_dir: "{{ working_dir }}/validate_ha_logs"                       
+working_dir: "/home/stack"
+validate_ha_logs_dir: "{{ working_dir }}/validate_ha_logs"
 overcloud_working_dir: "/home/heat-admin"
 
 environment_file: environment.j2
diff --git a/tools/ha-test-suite/test/test_keystone-constraint-removal b/tools/ha-test-suite/test/test_keystone-constraint-removal
index f4007be..aee50e9 100644
--- a/tools/ha-test-suite/test/test_keystone-constraint-removal
+++ b/tools/ha-test-suite/test/test_keystone-constraint-removal
@@ -2,7 +2,7 @@
 
 echo "$(date) * Step 1: disable keystone resource via httpd stop"
 play_on_resources "disable" "httpd"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
 
diff --git a/tools/ha-test-suite/test/test_keystone-stop b/tools/ha-test-suite/test/test_keystone-stop
index d0c9e54..040aeaa 100644
--- a/tools/ha-test-suite/test/test_keystone-stop
+++ b/tools/ha-test-suite/test/test_keystone-stop
@@ -2,6 +2,6 @@
 
 echo "$(date) * Step 1: disable openstack-keystone resource"
 play_on_resources "disable" "openstack-keystone-clone"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
diff --git a/tools/ha-test-suite/test/test_master-slave b/tools/ha-test-suite/test/test_master-slave
index be93899..6c2b0bf 100644
--- a/tools/ha-test-suite/test/test_master-slave
+++ b/tools/ha-test-suite/test/test_master-slave
@@ -2,6 +2,6 @@
 
 echo "$(date) * Step 1: disable galera, redis and rabbitmq"
 play_on_resources "disable" "$OVERCLOUD_CORE_RESOURCES"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
diff --git a/tools/ha-test-suite/test/test_mongo-with-aodh-ceilometer b/tools/ha-test-suite/test/test_mongo-with-aodh-ceilometer
index 0e0cb2e..cc8efea 100644
--- a/tools/ha-test-suite/test/test_mongo-with-aodh-ceilometer
+++ b/tools/ha-test-suite/test/test_mongo-with-aodh-ceilometer
@@ -2,7 +2,7 @@
 
 echo "$(date) * Step 1: disable mongo"
 play_on_resources "disable" "mongo"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
 
diff --git a/tools/ha-test-suite/test/test_pacemaker-light-a b/tools/ha-test-suite/test/test_pacemaker-light-a
index 5201adc..7149cf2 100644
--- a/tools/ha-test-suite/test/test_pacemaker-light-a
+++ b/tools/ha-test-suite/test/test_pacemaker-light-a
@@ -2,18 +2,18 @@
 
 echo "$(date) * Step 1: disable all the systemd resources"
 play_on_resources "disable" "$OVERCLOUD_SYSTEMD_RESOURCES"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
-   
+
 echo "$(date) * Step 2: disable core services"
 play_on_resources "disable" "$OVERCLOUD_CORE_RESOURCES"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
-   
+
 echo "$(date) * Step 3: enable each resource one by one and check the status"
 play_on_resources "enable" "$OVERCLOUD_SYSTEMD_RESOURCES"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
diff --git a/tools/ha-test-suite/test/test_pacemaker-light-b b/tools/ha-test-suite/test/test_pacemaker-light-b
index 47fefe7..52a5d99 100644
--- a/tools/ha-test-suite/test/test_pacemaker-light-b
+++ b/tools/ha-test-suite/test/test_pacemaker-light-b
@@ -2,18 +2,18 @@
 
 echo "$(date) * Step 1: disable core services"
 play_on_resources "disable" "$OVERCLOUD_CORE_RESOURCES"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
-   
+
 echo "$(date) * Step 2: disable all the systemd resources"
 play_on_resources "disable" "$OVERCLOUD_SYSTEMD_RESOURCES"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
-   
+
 echo "$(date) * Step 3: enable all the systemd resources"
 play_on_resources "enable" "$OVERCLOUD_SYSTEMD_RESOURCES"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
diff --git a/tools/ha-test-suite/test/test_pacemaker-light-c b/tools/ha-test-suite/test/test_pacemaker-light-c
index d96ab3e..9db2936 100644
--- a/tools/ha-test-suite/test/test_pacemaker-light-c
+++ b/tools/ha-test-suite/test/test_pacemaker-light-c
@@ -2,10 +2,10 @@
 
 echo "$(date) * Step 1: disable core services"
 play_on_resources "disable" "$OVERCLOUD_CORE_RESOURCES"
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
-   
+
 echo "$(date) * Step 2: poll every minute for twenty minutes the status of the resources"
 for i in $(seq 1 20)
  do
@@ -17,6 +17,6 @@ for i in $(seq 1 20)
   fi
   sleep 60
  done
-   
+
 echo "$(date) - List of cluster's failed actions:"
 check_failed_actions
diff --git a/tools/ha-test-suite/test/test_processes-after-cluster-stop b/tools/ha-test-suite/test/test_processes-after-cluster-stop
index 21f8ad9..11208fb 100644
--- a/tools/ha-test-suite/test/test_processes-after-cluster-stop
+++ b/tools/ha-test-suite/test/test_processes-after-cluster-stop
@@ -2,9 +2,9 @@
 
 echo "$(date) * Step 1: checking actual process status"
 check_resources_process_status
-   
+
 echo "$(date) * Step 2: stopping cluster"
 sudo pcs cluster stop --all
-   
+
 echo "$(date) * Step 3: checking actual process status"
 check_resources_process_status