diff --git a/defaults/main.yml b/defaults/main.yml index 58cf3d63..f6a4d309 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -342,6 +342,7 @@ tempest_projects: - "tempest" ## Tunable overrides +tempest_tempest_conf_search_overrides_pattern: 'tempest_tempest_conf_overrides' tempest_tempest_conf_overrides: {} ## The name of cloud from clouds.yaml diff --git a/tasks/tempest_post_install.yml b/tasks/tempest_post_install.yml index c50ef15c..af5f6b84 100644 --- a/tasks/tempest_post_install.yml +++ b/tasks/tempest_post_install.yml @@ -37,7 +37,7 @@ owner: "root" group: "root" mode: "0644" - config_overrides: "{{ tempest_tempest_conf_overrides }}" + config_overrides: "{{ _tempest_tempest_conf_overrides_gathered }}" config_type: "ini" register: copy_tempest_config when: not tempest_use_tempestconf | bool diff --git a/vars/main.yml b/vars/main.yml index 38a8d144..ecc102c5 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -143,3 +143,6 @@ _tempest_test_gathered_excludelist: "{{ query('vars', *query('varnames', '^' ~ t # with any dynamically gathered variables _tempest_test_includelist: "{{ tempest_test_includelist | union(_tempest_test_gathered_includelist) }}" _tempest_test_excludelist: "{{ tempest_test_excludelist | union(_tempest_test_gathered_excludelist) }}" + +# gather tempest config overrides from any variables starting wth the defined search pattern +_tempest_tempest_conf_overrides_gathered: "{{ query('vars', *query('varnames', '^' ~ tempest_tempest_conf_search_overrides_pattern)) | combine }}"