openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix failure handling in prechecks"

Browse Source
This commit is contained in:
Zuul 2018-01-04 09:25:00 +00:00 committed by Gerrit Code Review
commit 30ff168583
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/haproxy/tasks/precheck.yml
View File

@ -79,7 +79,8 @@
changed_when: false changed_when: false
failed_when: >- failed_when: >-
'169.254.' not in kolla_internal_vip_address and '169.254.' not in kolla_internal_vip_address and
kolla_internal_vip_address | ipaddr(ip_addr_output.stdout.split()[3]) is none (ip_addr_output | failed or
kolla_internal_vip_address | ipaddr(ip_addr_output.stdout.split()[3]) is none)
when: when:
- enable_haproxy | bool - enable_haproxy | bool
- container_facts['keepalived'] is not defined - container_facts['keepalived'] is not defined

3
ansible/roles/prechecks/tasks/service_checks.yml
View File

@ -7,6 +7,9 @@
failed_when: result | failed failed_when: result | failed
or (result.stdout | from_yaml).Server.Version | regex_replace('(\\d+\\.\\d+\\.\\d+).*', '\\1') | version_compare(docker_version_min, '<') or (result.stdout | from_yaml).Server.Version | regex_replace('(\\d+\\.\\d+\\.\\d+).*', '\\1') | version_compare(docker_version_min, '<')
# NOTE(mgoddard): If passwords.yml is encrypted using ansible-vault, this check
# will pass, but only because nothing in the vault file has the format of a
# YAML dict item.
- name: Checking empty passwords in passwords.yml. Run kolla-genpwd if this task fails - name: Checking empty passwords in passwords.yml. Run kolla-genpwd if this task fails
local_action: command grep '^[^#].*:\s*$' "{{ CONFIG_DIR | default('/etc/kolla') }}/passwords.yml" local_action: command grep '^[^#].*:\s*$' "{{ CONFIG_DIR | default('/etc/kolla') }}/passwords.yml"
run_once: True run_once: True