diff --git a/ansible/roles/prechecks/tasks/service_checks.yml b/ansible/roles/prechecks/tasks/service_checks.yml
index 262e6f7149..07ec5ac616 100644
--- a/ansible/roles/prechecks/tasks/service_checks.yml
+++ b/ansible/roles/prechecks/tasks/service_checks.yml
@@ -34,3 +34,9 @@
        or inventory_hostname in groups['neutron-l3-agent']
        or inventory_hostname in groups['neutron-metadata-agent'])
     - ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04'
+
+- name: Checking empty passwords in /etc/kolla/passwords.yml. Run kolla-genpwd is this task fails
+  local_action: command grep '^[^#].*:\s*$' /etc/kolla/passwords.yml
+  register: result
+  changed_when: false
+  failed_when: result.stdout != ""