zuul/zuul-jobs
Code Issues Proposed changes

Use zuul_site_traceroute_host properly

Browse Source 
The site-variables value is zuul_site_traceroute_host.

Change-Id: I672aa96ca6f9398dea1f09891d10b05b9ada0685
This commit is contained in:
Monty Taylor 2017-09-08 19:04:24 -05:00
parent 579d9f2202
commit 15d8a916a0
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles/validate-host/README.rst
View File

@ -2,13 +2,6 @@ Log information about the build node
**Role Variables** **Role Variables**
.. zuul:rolevar:: zuul_traceroute_host
:default: {{ zuul_site_traceroute_host }}
If defined, a host to run a traceroute against to verify build node
network connectivity.
**DEPRECATED** being replaced by zuul_site versions.
.. zuul:rolevar:: zuul_image_manifest .. zuul:rolevar:: zuul_image_manifest
:default: {{ zuul_site_image_manifest|default('/etc/dib-builddate.txt') }} :default: {{ zuul_site_image_manifest|default('/etc/dib-builddate.txt') }}

1
roles/validate-host/defaults/main.yaml
View File

@ -1,3 +1,2 @@
zuul_site_traceroute_host: "{{ zuul_traceroute_host|default(omit) }}"
zuul_site_image_manifest: "{{ validate_host_default_image_manifest_files }}" zuul_site_image_manifest: "{{ validate_host_default_image_manifest_files }}"
zuul_site_image_manifest_files: "{{ zuul_site_image_manifest_files|default(validate_host_default_image_manifest_files) }}" zuul_site_image_manifest_files: "{{ zuul_site_image_manifest_files|default(validate_host_default_image_manifest_files) }}"

4
roles/validate-host/templates/zuul-info.j2
View File

@ -42,13 +42,13 @@ Network neighbors
{% if 'traceroute_v4' in zdi %} {% if 'traceroute_v4' in zdi %}
Route to Known Host v4 Route to Known Host v4
====================== ======================
Known Host: {{ zuul_traceroute_host }} Known Host: {{ zuul_site_traceroute_host }}
{{ zdi.traceroute_v4 }} {{ zdi.traceroute_v4 }}
{% endif %} {% endif %}
{% if 'traceroute_v6' in zdi %} {% if 'traceroute_v6' in zdi %}
Route to Known Host v6 Route to Known Host v6
====================== ======================
Known Host: {{ zuul_traceroute_host }} Known Host: {{ zuul_site_traceroute_host }}
{{ zdi.traceroute_v6 }} {{ zdi.traceroute_v6 }}
{% endif %} {% endif %}