openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Ensure failures on the undercloud leads to a complete stop"

This commit is contained in:
Zuul 2022-02-15 08:39:47 +00:00 committed by Gerrit Code Review
parent 354e75923b 80b294ba88
commit c05bf68af5
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleo_common/inventory.py
View File

@ -695,6 +695,11 @@ class TripleoInventory(object):
_vars.setdefault('ansible_connection', self.undercloud_connection)
# see https://github.com/ansible/ansible/issues/41808
_vars.setdefault('ansible_remote_tmp', '/tmp/ansible-${USER}')
# We don't want to let UC fail, especially when it comes to
# external tasks.
# See https://bugs.launchpad.net/tripleo/+bug/1960518 for context
_vars.setdefault('any_error_fatal', True)
_vars.setdefault('max_fail_percentage', 0)
if self.ansible_python_interpreter:
_vars.setdefault('ansible_python_interpreter',

16
tripleo_common/tests/test_inventory.py
View File

@ -290,6 +290,8 @@ class TestInventory(base.TestCase):
'ansible_host': 'localhost',
'ansible_python_interpreter': sys.executable,
'ansible_remote_tmp': '/tmp/ansible-${USER}',
'any_error_fatal': True,
'max_fail_percentage': 0,
'overcloud_keystone_url': 'xyz://keystone',
'overcloud_admin_password': 'theadminpw',
'plan': 'overcloud',
@ -389,6 +391,8 @@ class TestInventory(base.TestCase):
'ansible_host': 'localhost',
'ansible_python_interpreter': sys.executable,
'ansible_remote_tmp': '/tmp/ansible-${USER}',
'any_error_fatal': True,
'max_fail_percentage': 0,
'undercloud_service_list': [
'tripleo_nova_compute',
'tripleo_heat_engine',
@ -534,6 +538,8 @@ class TestInventory(base.TestCase):
'ansible_host': 'localhost',
'ansible_python_interpreter': 'foo',
'ansible_remote_tmp': '/tmp/ansible-${USER}',
'any_error_fatal': True,
'max_fail_percentage': 0,
'overcloud_keystone_url': 'xyz://keystone',
'overcloud_admin_password': 'theadminpw',
'plan': 'overcloud',
@ -572,10 +578,10 @@ class TestInventory(base.TestCase):
'vars': {
'ansible_connection': 'local',
'ansible_host': 'localhost',
'ansible_python_interpreter':
sys.executable,
'ansible_remote_tmp':
'/tmp/ansible-${USER}',
'ansible_python_interpreter': sys.executable,
'ansible_remote_tmp': '/tmp/ansible-${USER}',
'any_error_fatal': True,
'max_fail_percentage': 0,
'overcloud_admin_password': 'theadminpw',
'overcloud_keystone_url': 'xyz://keystone',
'plan': 'overcloud',
@ -981,6 +987,8 @@ class TestInventory(base.TestCase):
'ansible_host': 'localhost',
'ansible_python_interpreter': sys.executable,
'ansible_remote_tmp': '/tmp/ansible-${USER}',
'any_error_fatal': True,
'max_fail_percentage': 0,
'overcloud_admin_password': 'theadminpw',
'overcloud_keystone_url': 'xyz://keystone',
'plan': 'overcloud',