update tripleo_operator_ansible VF hooks since CLI has changed

this patch amends tripleo operator ansible vf hooks - two changes

1) no more plan files - removed that CLI option
2) static inventory is simply inventory - amended that argument

Change-Id: I3e97dcc08fb5b9370b1fa2ce732572a0c70aa947
This commit is contained in:
David J Peacock 2022-06-15 09:24:11 -04:00
parent 93b1fa832c
commit fd8f962e70
4 changed files with 3 additions and 19 deletions

View File

@ -12,12 +12,11 @@ Role Variables
--------------
* `tripleo_validator_run_debug`: (Boolean) Flag to print out the delete command. Default: False
* `tripleo_validator_run_plan`: (String) Plan to run validations against
* `tripleo_validator_run_workers`: (Integer) Number of workers
* `tripleo_validator_run_extra_vars_file`: (String) Path to an ansible vars file to use when running the validations
* `tripleo_validator_run_validation`: (String) Specific validation to run
* `tripleo_validator_run_group`: (String) Group of validations to run
* `tripleo_validator_run_static_inventory`: (String) Path to a static inventory file
* `tripleo_validator_run_inventory`: (String) Path to a inventory file
Output Variables
----------------

View File

@ -1,9 +1,8 @@
---
tripleo_validator_run_debug: false
tripleo_validator_run_plan:
tripleo_validator_run_workers:
tripleo_validator_run_extra_vars:
tripleo_validator_run_extra_vars_file:
tripleo_validator_run_validation: []
tripleo_validator_run_group: []
tripleo_validator_run_static_inventory:
tripleo_validator_run_inventory:

View File

@ -74,19 +74,6 @@
- tripleo_validator_run_result.stdout ==
"tripleo validator run --extra-vars-file /tmp/foo.json --group no-op"
- name: Check parameter "tripleo_validator_run_plan"
include_role:
name: "tripleo_validator_run"
vars:
tripleo_validator_run_plan: 'my-thing'
tripleo_validator_run_group: 'no-op'
- name: Assert "tripleo_validator_run_plan"
assert:
that:
- tripleo_validator_run_result.stdout ==
'tripleo validator run --plan my-thing --group no-op'
- name: Check parameter "tripleo_validator_run_workers"
include_role:
name: "tripleo_validator_run"

View File

@ -17,12 +17,11 @@
set_fact:
_validator_run_cmd: >-
{{ openstack_bin }} tripleo validator run
{{ tripleo_validator_run_plan | ternary('--plan ' ~ tripleo_validator_run_plan, '') }}
{{ tripleo_validator_run_workers | ternary('--workers ' ~ tripleo_validator_run_workers, '') }}
{{ tripleo_validator_run_extra_vars_file | ternary('--extra-vars-file ' ~ tripleo_validator_run_extra_vars_file, '') }}
{{ tripleo_validator_run_validation | ternary('--validation "${TRIPLEO_VALIDATOR_RUN_VALIDATION}"', '') }}
{{ tripleo_validator_run_group | ternary('--group "${TRIPLEO_VALIDATOR_RUN_GROUP}"', '') }}
{{ tripleo_validator_run_static_inventory | ternary('--static-inventory ' ~ tripleo_validator_run_static_inventory, '') }}
{{ tripleo_validator_run_inventory | ternary('--inventory ' ~ tripleo_validator_run_inventory, '') }}
_validator_run_env:
TRIPLEO_VALIDATOR_RUN_VALIDATION: >-
{%- if tripleo_validator_run_validation is string -%}