The whole devstack log is written into the console output
(job-output.txt) and into devstacklog.txt.
Remove it from job-output and add a devstack-early log file (same as in
legacy job) that includes all the output of stack.sh.
Make sure the log file is pulled into the stage folder so that it will
end up on logs.o.o.
Change-Id: Ia7c1d8fe5cc03d15f455c6e62ebf4a5f6d62ab1f
... | ... |
@@ -3,6 +3,7 @@ |
3 | 3 |
vars: |
4 | 4 |
devstack_log_dir: "{{ devstack_base_dir|default('/opt/stack') }}/logs/" |
5 | 5 |
devstack_conf_dir: "{{ devstack_base_dir|default('/opt/stack') }}/devstack/" |
6 |
+ devstack_full_log: "{{ devstack_early_log|default('/opt/stack/logs/devstack-early.txt') }}" |
|
6 | 7 |
tasks: |
7 | 8 |
# NOTE(andreaf) If the tempest service is enabled, a tempest.log is |
8 | 9 |
# generated as part of lib/tempest, as a result of verify_tempest_config |
... | ... |
@@ -26,6 +27,7 @@ |
26 | 26 |
'{{ devstack_log_dir }}/dstat-csv.log': 'logs', |
27 | 27 |
'{{ devstack_log_dir }}/devstacklog.txt': 'logs', |
28 | 28 |
'{{ devstack_log_dir }}/devstacklog.txt.summary': 'logs', |
29 |
+ '{{ devstack_full_log}}': 'logs', |
|
29 | 30 |
'{{ stage_dir }}/verify_tempest_conf.log': 'logs' } |
30 | 31 |
extensions_to_txt: |
31 | 32 |
- conf |
... | ... |
@@ -6,3 +6,9 @@ Run devstack |
6 | 6 |
:default: /opt/stack |
7 | 7 |
|
8 | 8 |
The devstack base directory. |
9 |
+ |
|
10 |
+.. zuul:rolevar:: devstack_early_log |
|
11 |
+ :default: /opt/stack/log/devstack-early.txt |
|
12 |
+ |
|
13 |
+ The full devstack log that includes the whatever stack.sh logs before |
|
14 |
+ the LOGFILE variable in local.conf is honoured. |