summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-21 00:59:58 +0000
committerGerrit Code Review <review@openstack.org>2018-11-21 00:59:58 +0000
commit7f6a3ff7336d345659d0885733c84a24699743fc (patch)
tree07deaeec92452b2649b0d07ce419b924578e104a
parentbe392d4c0e6c024a68936c204b9963fb2b5f5d21 (diff)
parent5102788c23e8984bd13e48377682d77f8d9065c6 (diff)
Merge "Fixed logstash file name for tempest"
-rw-r--r--roles/collect-logs/defaults/main.yml12
-rw-r--r--roles/validate-tempest/README.md1
2 files changed, 6 insertions, 7 deletions
diff --git a/roles/collect-logs/defaults/main.yml b/roles/collect-logs/defaults/main.yml
index 70b7595..25e227e 100644
--- a/roles/collect-logs/defaults/main.yml
+++ b/roles/collect-logs/defaults/main.yml
@@ -140,12 +140,12 @@ artcl_zuul_swift_upload_path: /usr/local/bin
140artcl_collect_sosreport: false 140artcl_collect_sosreport: false
141artcl_sosreport_options: "--batch" 141artcl_sosreport_options: "--batch"
142 142
143## Doc generation specific vars 143# Doc generation specific vars
144artcl_gen_docs: false 144artcl_gen_docs: false
145artcl_create_docs_payload: 145artcl_create_docs_payload:
146 included_deployment_scripts: [] 146 included_deployment_scripts: []
147 included_static_docs: [] 147 included_static_docs: []
148 table_of_contents: [] 148 table_of_contents: []
149artcl_docs_source_dir: "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/docs/source" 149artcl_docs_source_dir: "{{ local_working_dir }}/usr/local/share/ansible/roles/collect-logs/docs/source"
150artcl_docs_build_dir: "{{ artcl_collect_dir }}/docs/build" 150artcl_docs_build_dir: "{{ artcl_collect_dir }}/docs/build"
151artcl_verify_sphinx_build: false 151artcl_verify_sphinx_build: false
@@ -184,10 +184,10 @@ artcl_logstash_files:
184 - /home/*/workload_launch.log 184 - /home/*/workload_launch.log
185 - /home/*/pkg_mgr_mirror_error.log 185 - /home/*/pkg_mgr_mirror_error.log
186 - /home/*/pkg_mgr_mirror.log 186 - /home/*/pkg_mgr_mirror.log
187 - /home/*/tempest_output.log 187 - /home/*/tempest.log
188 - /var/log/bootstrap-subnodes.log 188 - /var/log/bootstrap-subnodes.log
189 - /var/log/tripleo-container-image-prepare.log 189 - /var/log/tripleo-container-image-prepare.log
190#ara_graphite_server: graphite.tripleo.org 190# ara_graphite_server: graphite.tripleo.org
191ara_graphite_prefix: "tripleo.{{ lookup('env', 'STABLE_RELEASE')|default('master', true) }}.{{ lookup('env', 'TOCI_JOBTYPE') }}." 191ara_graphite_prefix: "tripleo.{{ lookup('env', 'STABLE_RELEASE')|default('master', true) }}.{{ lookup('env', 'TOCI_JOBTYPE') }}."
192ara_only_successful_tasks: true 192ara_only_successful_tasks: true
193ara_tasks_map: 193ara_tasks_map:
diff --git a/roles/validate-tempest/README.md b/roles/validate-tempest/README.md
index bd11022..a241cc6 100644
--- a/roles/validate-tempest/README.md
+++ b/roles/validate-tempest/README.md
@@ -17,7 +17,6 @@ Role Variables
17* `tempest_format`: venv/packages/container - Which tempest installation to use - either install python virtual environment 17* `tempest_format`: venv/packages/container - Which tempest installation to use - either install python virtual environment
18 with installed there python modules from requirements file, or to use installed with RDO RPM packages 18 with installed there python modules from requirements file, or to use installed with RDO RPM packages
19 or to use Kolla provided tempest container image (default: packages) 19 or to use Kolla provided tempest container image (default: packages)
20* `tempest_log_file` - name of log file for tempest run (default: tempest_output.log)
21* `test_white_regex` - tests regular expression for tempest run, i.e. smoke or tempest.api.object_storage|keystone_tempest_plugin. 20* `test_white_regex` - tests regular expression for tempest run, i.e. smoke or tempest.api.object_storage|keystone_tempest_plugin.
22* `run_tempest`: false/true - to run tempest or not (default: false) 21* `run_tempest`: false/true - to run tempest or not (default: false)
23* `post_tempest`: false/true - to run post processing of tempest results after tempest run 22* `post_tempest`: false/true - to run post processing of tempest results after tempest run