openstack
/
python-tripleoclient
Code Issues Proposed changes

Improve tripleo-validations hook in undercloud preflight 

Improve tripleo-validations hook in undercloud preflight checks.
Previously, this would only run undercloud disk usage checks but
now it's used to validate libvirtd service state too.

Depends-on: https://review.opendev.org/831424
Change-Id: I89d85b9ef846aa7bb71c9f0b1a07bea87b97a82b
(cherry picked from commit 0c48816539)
This commit is contained in:
David Hill 2022-02-22 13:11:29 -05:00 committed by Harald Jensås
parent 423daff2f3
commit 91808758d8
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleoclient/constants.py
View File

@ -196,10 +196,12 @@ DEPLOY_ANSIBLE_ACTIONS = {
'tags': 'online_upgrade'
},
'preflight-deploy': {
'playbook': 'undercloud-disk-space.yaml'
'playbooks': ['undercloud-disk-space.yaml',
'undercloud-disabled-services.yaml']
},
'preflight-upgrade': {
'playbook': 'undercloud-disk-space-pre-upgrade.yaml'
'playbooks': ['undercloud-disk-space-pre-upgrade.yaml',
'undercloud-disabled-services.yaml']
},
}

14
tripleoclient/v1/undercloud_preflight.py
View File

@ -74,15 +74,17 @@ def _run_live_command(args, env=None, name=None, cwd=None, wait=True):
raise RuntimeError(message)
def _check_diskspace(upgrade=False):
"""Check undercloud disk space
def _run_validations(upgrade=False):
"""Run tripleo-validations playbook
This runs a simple ansible playbook located in tripleo-validations
There are currently two playbooks:
This runs simple ansible playbooks located in tripleo-validations
There are currently three playbooks:
- undercloud-disk-space.yaml
- undercloud-disk-space-pre-upgrade.yaml
- undercloud-disabled-services.yaml
First one checks minimal disk space for a brand new deploy.
Second one checks minimal disk space for an upgrade.
Third one checks for services that should be disabled on the undercloud.
"""
if upgrade:
playbook_args = constants.DEPLOY_ANSIBLE_ACTIONS['preflight-upgrade']
@ -95,7 +97,7 @@ def _check_diskspace(upgrade=False):
inventory='undercloud',
log_path=tmp,
validations_dir=constants.ANSIBLE_VALIDATION_DIR,
validation_name=[playbook_args['playbook']])
validation_name=playbook_args['playbooks'])
def _check_memory():
@ -505,7 +507,7 @@ def check(verbose_level, upgrade=False):
_checking_status('Memory')
_check_memory()
_checking_status('Disk space')
_check_diskspace(upgrade)
_run_validations(upgrade)
_checking_status('Sysctl')
_check_sysctl()
_checking_status('Password file')