diff options
| -rw-r--r-- | ansible/roles/neutron/defaults/main.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/neutron_plugin_agent_check.yml | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 9716b5a1b..70dae7e0c 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -439,7 +439,11 @@ neutron_server_enable_healthchecks: "{{ enable_container_healthchecks }}" neutron_server_healthcheck_interval: "{{ default_container_healthcheck_interval }}" neutron_server_healthcheck_retries: "{{ default_container_healthcheck_retries }}" neutron_server_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}" -neutron_server_healthcheck_test: ["CMD-SHELL", "healthcheck_curl {{ 'https' if neutron_enable_tls_backend | bool else 'http' }}://{{ api_interface_address | put_address_in_context('url') }}:{{ neutron_server_listen_port }}"] +neutron_server_healthcheck_test: + - "CMD-SHELL" + - >- + healthcheck_curl {{ 'https' if neutron_enable_tls_backend | bool else 'http' }}://{{ + api_interface_address | put_address_in_context('url') }}:{{ neutron_server_listen_port }} neutron_server_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}" neutron_server_healthcheck: interval: "{{ neutron_server_healthcheck_interval }}" diff --git a/ansible/roles/neutron/tasks/neutron_plugin_agent_check.yml b/ansible/roles/neutron/tasks/neutron_plugin_agent_check.yml index 0f89a0789..ac61a633d 100644 --- a/ansible/roles/neutron/tasks/neutron_plugin_agent_check.yml +++ b/ansible/roles/neutron/tasks/neutron_plugin_agent_check.yml @@ -25,7 +25,9 @@ assert: that: neutron_plugin_agent == 'ovn' fail_msg: "ML2/OVN agent detected, neutron_plugin_agent is not set to 'ovn', Kolla-Ansible does not support this migration operation." - when: (container_facts.containers['ovn_controller'] is defined) or (container_volume_facts['ovn_nb_db'] is defined) or (container_volume_facts['ovn_sb_db'] is defined) + when: (container_facts.containers['ovn_controller'] is defined) + or (container_volume_facts['ovn_nb_db'] is defined) + or (container_volume_facts['ovn_sb_db'] is defined) - name: Check for ML2/OVS presence assert: |