diff options
| -rw-r--r-- | ansible/roles/prechecks/tasks/service_checks.yml | 6 | ||||
| -rwxr-xr-x | tools/kolla-ansible | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ansible/roles/prechecks/tasks/service_checks.yml b/ansible/roles/prechecks/tasks/service_checks.yml index 07ec5ac61..14aed9904 100644 --- a/ansible/roles/prechecks/tasks/service_checks.yml +++ b/ansible/roles/prechecks/tasks/service_checks.yml @@ -35,8 +35,8 @@ 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 +- name: Checking empty passwords in passwords.yml. Run kolla-genpwd if this task fails + local_action: command grep '^[^#].*:\s*$' "{{ CONFIG_DIR }}/passwords.yml" register: result changed_when: false - failed_when: result.stdout != "" + failed_when: result.stdout | regex_replace('(.*nova_ssh_key.*)', '') | search(":") diff --git a/tools/kolla-ansible b/tools/kolla-ansible index 16634b268..36ecc0397 100755 --- a/tools/kolla-ansible +++ b/tools/kolla-ansible @@ -160,6 +160,6 @@ case "$1" in ;; esac -CONFIG_OPTS="-e @${CONFIG_DIR}/globals.yml -e @${CONFIG_DIR}/passwords.yml" +CONFIG_OPTS="-e @${CONFIG_DIR}/globals.yml -e @${CONFIG_DIR}/passwords.yml -e CONFIG_DIR=${CONFIG_DIR}" CMD="ansible-playbook -i $INVENTORY $CONFIG_OPTS $EXTRA_OPTS $PLAYBOOK $VERBOSITY" process_cmd |