diff --git a/roles/tripleo_validations/defaults/main.yml b/roles/tripleo_validations/defaults/main.yml index 00d27f4d1..107a240e3 100644 --- a/roles/tripleo_validations/defaults/main.yml +++ b/roles/tripleo_validations/defaults/main.yml @@ -2,6 +2,7 @@ val_working_dir: "{{ working_dir }}" validation_log_dir: "/var/log/validations" validation_environment: "{{ job.environment_type|default('undercloud') }}" +tripleo_inventory: "tripleo-ansible-inventory.yaml" # Passing default to component, allow to run the role outside of CI component: "{{ job.component|default(None) }}" # both commands can be used: diff --git a/roles/tripleo_validations/tasks/run.yml b/roles/tripleo_validations/tasks/run.yml index c8d2f75a6..b0ec49651 100644 --- a/roles/tripleo_validations/tasks/run.yml +++ b/roles/tripleo_validations/tasks/run.yml @@ -13,7 +13,7 @@ register: run_validation_list shell: | export OS_CLOUD={{ validation_environment }} - {{ validation_command }} run --validation {{ item }} > validation_{{ item }}.log 2>&1 + {{ validation_command }} run --validation {{ item }} --static-inventory {{ val_working_dir }}/{{ tripleo_inventory }} > validation_{{ item }}.log 2>&1 when: - run_from_list|bool loop: "{{ validations_list[component] }}" diff --git a/roles/tripleo_validations/vars/main.yml b/roles/tripleo_validations/vars/main.yml index 1acc015ab..3aaed6171 100644 --- a/roles/tripleo_validations/vars/main.yml +++ b/roles/tripleo_validations/vars/main.yml @@ -2,15 +2,14 @@ validations_list: compute: - nova-status - - nova-svirt network: - - neutron-sanity-check + - undercloud-neutron-sanity-check validation: - check-ram - check-cpu - 512e tripleo: - - undercloud-disk-space + - undercloud-process-count validations_group: compute: - compute