openstack/devstack
Code Issues Proposed changes

Move zuul_copy_output to be a job variable

Browse Source 
The zuul_copy_output variable is designed to be able to be used as
a zuul job variable so that zuul dictionary merging will work. However,
it's currently being set in the playbook rather than as a job variable,
so it's not possible to supplement it in a child job.

Move it to be a job variable. Also remove the wrapping {} as they should
not be needed to make zuul_copy_output a dictionary.

Change-Id: I78c7fed47c2ab868384c74dbff7904d33d510dd9
This commit is contained in:
Monty Taylor 2018-01-22 16:18:55 -06:00
parent 614cab33c4
commit a904caded4
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.zuul.yaml
View File

@ -77,6 +77,40 @@
devstack_services:
horizon: false
tempest: false
zuul_copy_output:
'{{ devstack_conf_dir }}/local.conf': 'logs'
'{{ devstack_conf_dir }}/localrc': 'logs'
'{{ devstack_conf_dir }}/.stackenv': 'logs'
'{{ devstack_log_dir }}/dstat-csv.log': 'logs'
'{{ devstack_log_dir }}/devstacklog.txt': 'logs'
'{{ devstack_log_dir }}/devstacklog.txt.summary': 'logs'
'{{ devstack_full_log}}': 'logs'
'{{ stage_dir }}/verify_tempest_conf.log': 'logs'
'{{ stage_dir }}/apache': 'logs'
'{{ stage_dir }}/apache_config': 'logs'
'{{ stage_dir }}/etc': 'logs'
'/var/log/rabbitmq': 'logs'
'/var/log/postgresql': 'logs'
'/var/log/mysql.err': 'logs'
'/var/log/mysql.log': 'logs'
'/var/log/libvirt': 'logs'
'/etc/sudoers': 'logs'
'/etc/sudoers.d': 'logs'
'{{ stage_dir }}/iptables.txt': 'logs'
'{{ stage_dir }}/df.txt': 'logs'
'{{ stage_dir }}/pip2-freeze.txt': 'logs'
'{{ stage_dir }}/pip3-freeze.txt': 'logs'
'{{ stage_dir }}/dpkg-l.txt': 'logs'
'{{ stage_dir }}/rpm-qa.txt': 'logs'
'{{ stage_dir }}/core': 'logs'
'{{ stage_dir }}/listen53.txt': 'logs'
'{{ stage_dir }}/deprecations.log': 'logs'
'/var/log/ceph': 'logs'
'/var/log/openvswitch': 'logs'
'/var/log/glusterfs': 'logs'
'/etc/glusterfs/glusterd.vol': 'logs'
'/etc/resolv.conf': 'logs'
'/var/log/unbound.log': 'logs'
pre-run: playbooks/pre.yaml
run: playbooks/devstack.yaml
post-run: playbooks/post.yaml

34
playbooks/post.yaml
View File

@ -24,40 +24,6 @@
# capture-system-logs should be the last role before stage-output
- capture-system-logs
- role: stage-output
zuul_copy_output:
{ '{{ devstack_conf_dir }}/local.conf': 'logs',
'{{ devstack_conf_dir }}/localrc': 'logs',
'{{ devstack_conf_dir }}/.stackenv': 'logs' ,
'{{ devstack_log_dir }}/dstat-csv.log': 'logs',
'{{ devstack_log_dir }}/devstacklog.txt': 'logs',
'{{ devstack_log_dir }}/devstacklog.txt.summary': 'logs',
'{{ devstack_full_log}}': 'logs',
'{{ stage_dir }}/verify_tempest_conf.log': 'logs',
'{{ stage_dir }}/apache': 'logs',
'{{ stage_dir }}/apache_config': 'logs',
'{{ stage_dir }}/etc': 'logs',
'/var/log/rabbitmq': 'logs',
'/var/log/postgresql': 'logs',
'/var/log/mysql.err': 'logs',
'/var/log/mysql.log': 'logs',
'/var/log/libvirt': 'logs',
'/etc/sudoers': 'logs',
'/etc/sudoers.d': 'logs',
'{{ stage_dir }}/iptables.txt': 'logs',
'{{ stage_dir }}/df.txt': 'logs',
'{{ stage_dir }}/pip2-freeze.txt': 'logs',
'{{ stage_dir }}/pip3-freeze.txt': 'logs',
'{{ stage_dir }}/dpkg-l.txt': 'logs',
'{{ stage_dir }}/rpm-qa.txt': 'logs',
'{{ stage_dir }}/core': 'logs',
'{{ stage_dir }}/listen53.txt': 'logs',
'{{ stage_dir }}/deprecations.log': 'logs',
'/var/log/ceph': 'logs',
'/var/log/openvswitch': 'logs',
'/var/log/glusterfs': 'logs',
'/etc/glusterfs/glusterd.vol': 'logs',
'/etc/resolv.conf': 'logs',
'/var/log/unbound.log': 'logs' }
extensions_to_txt:
- conf
- log