Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/ansible/roles/prechecks/tasks/service_checks.yml b/ansible/roles/prechecks/tasks/service_checks.yml
- index 07ec5ac..30ce64b 100644
- --- a/ansible/roles/prechecks/tasks/service_checks.yml
- +++ b/ansible/roles/prechecks/tasks/service_checks.yml
- @@ -36,7 +36,7 @@
- - 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
- + local_action: command grep '^[^#].*:\s*$' "{{ CONFIG_DIR }}/passwords.yml"
- register: result
- changed_when: false
- failed_when: result.stdout != ""
- diff --git a/tools/kolla-ansible b/tools/kolla-ansible
- index 16634b2..2a3beb6 100755
- --- a/tools/kolla-ansible
- +++ b/tools/kolla-ansible
- @@ -160,6 +160,7 @@ 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
- root@operator:/var/src/kolla#
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement