openstack
/
openstack-ansible-os_octavia
Code Issues Proposed changes

Merge "Fix usage of "|" for tests"

This commit is contained in:
Zuul 2018-07-25 18:32:39 +00:00 committed by Gerrit Code Review
parent 6c73550005 64e9f5ad30
commit 4dd27f67f8
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/octavia_amp_image.yml
View File

@ -39,7 +39,7 @@
- octavia_amp_image_upload_enabled
- octavia_image_downloader == "deployment-host"
register: octavia_amp_image_copy_result
until: octavia_amp_image_copy_result | success
until: octavia_amp_image_copy_result is success
retries: 6
delay: 5

14
tasks/octavia_install.yml
View File

@ -20,7 +20,7 @@
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
register: install_packages
until: install_packages|success
until: install_packages is success
retries: 5
delay: 2
@ -42,7 +42,7 @@
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }}
register: install_packages
until: install_packages|success
until: install_packages is success
retries: 5
delay: 2
@ -65,7 +65,7 @@
file:
path: "{{ octavia_bin | dirname }}"
state: absent
when: octavia_get_venv | changed
when: octavia_get_venv is changed
- name: Create octavia venv dir
file:
@ -81,7 +81,7 @@
copy: "no"
when:
- not octavia_developer_mode | bool
- octavia_get_venv | changed or octavia_venv_dir | changed
- octavia_get_venv is changed or octavia_venv_dir is changed
notify: Restart octavia services
- name: Install pip packages
@ -95,7 +95,7 @@
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }}
register: install_packages
until: install_packages|success
until: install_packages is success
retries: 5
delay: 2
when: octavia_developer_mode | bool
@ -108,7 +108,7 @@
when:
- ansible_pkg_mgr == 'yum'
- not octavia_developer_mode | bool
- octavia_get_venv | changed or octavia_venv_dir | changed
- octavia_get_venv is changed or octavia_venv_dir is changed
# NOTE(odyssey4me):
# We reinitialize the venv to ensure that the right
@ -128,7 +128,7 @@
--no-wheel
when:
- not octavia_developer_mode | bool
- octavia_get_venv | changed or octavia_venv_dir | changed
- octavia_get_venv is changed or octavia_venv_dir is changed
tags:
- skip_ansible_lint

2
tasks/octavia_policy.yml
View File

@ -26,7 +26,7 @@
insecure: "{{ keystone_service_adminuri_insecure }}"
role_name: "{{ item }}"
register: add_role
until: add_role|success
until: add_role is success
retries: 5
delay: 10
no_log: True

8
tasks/octavia_service_add.yml
View File

@ -26,7 +26,7 @@
description: "{{ octavia_service_description }}"
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
until: add_service|success
until: add_service is success
retries: 5
delay: 10
no_log: True
@ -45,7 +45,7 @@
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
when: not octavia_service_in_ldap | bool
until: add_service|success
until: add_service is success
retries: 5
delay: 10
no_log: True
@ -64,7 +64,7 @@
insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_service
when: not octavia_service_in_ldap | bool
until: add_service|success
until: add_service is success
retries: 5
delay: 10
no_log: True
@ -90,7 +90,7 @@
- url: "{{ octavia_service_adminuri }}"
interface: "admin"
register: add_service_v2
until: add_service_v2|success
until: add_service_v2 is success
retries: 5
delay: 10
no_log: True

2
tests/test-configure-octavia.yml
View File

@ -27,7 +27,7 @@
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }}
register: install_packages
until: install_packages|success
until: install_packages is success
retries: 5
delay: 2
vars_files:

8
tests/test-octavia.yml
View File

@ -42,7 +42,7 @@
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }}
register: install_packages
until: install_packages|success
until: install_packages is success
retries: 5
delay: 2
with_items:
@ -143,7 +143,7 @@
openstack loadbalancer show test-lb
environment: "{{ env }}"
when:
- debug|bool == true
- debug | bool
tags:
- skip_ansible_lint
@ -161,13 +161,13 @@
uri:
url: "http://{{ vip }}"
status_code: 503
when: test_octavia_amphora|bool == true
when: test_octavia_amphora | bool
- name: Delete LoadBalancer
shell: >
openstack loadbalancer delete --cascade test-lb
environment: "{{ env }}"
register: lb_deleted
until: lb_deleted|success
until: lb_deleted is success
retries: 10
delay: 15
tags: