From 15d8a916a04598a0a5b0141a47da89e3efd22267 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 8 Sep 2017 19:04:24 -0500 Subject: [PATCH] Use zuul_site_traceroute_host properly The site-variables value is zuul_site_traceroute_host. Change-Id: I672aa96ca6f9398dea1f09891d10b05b9ada0685 --- roles/validate-host/README.rst | 7 ------- roles/validate-host/defaults/main.yaml | 1 - roles/validate-host/templates/zuul-info.j2 | 4 ++-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/roles/validate-host/README.rst b/roles/validate-host/README.rst index c5ab5cf6d..5403cedcf 100644 --- a/roles/validate-host/README.rst +++ b/roles/validate-host/README.rst @@ -2,13 +2,6 @@ Log information about the build node **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 :default: {{ zuul_site_image_manifest|default('/etc/dib-builddate.txt') }} diff --git a/roles/validate-host/defaults/main.yaml b/roles/validate-host/defaults/main.yaml index b55ea0dd5..0784d5d0e 100644 --- a/roles/validate-host/defaults/main.yaml +++ b/roles/validate-host/defaults/main.yaml @@ -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_files: "{{ zuul_site_image_manifest_files|default(validate_host_default_image_manifest_files) }}" diff --git a/roles/validate-host/templates/zuul-info.j2 b/roles/validate-host/templates/zuul-info.j2 index ab3aed0f5..eb3dce097 100644 --- a/roles/validate-host/templates/zuul-info.j2 +++ b/roles/validate-host/templates/zuul-info.j2 @@ -42,13 +42,13 @@ Network neighbors {% if 'traceroute_v4' in zdi %} Route to Known Host v4 ====================== -Known Host: {{ zuul_traceroute_host }} +Known Host: {{ zuul_site_traceroute_host }} {{ zdi.traceroute_v4 }} {% endif %} {% if 'traceroute_v6' in zdi %} Route to Known Host v6 ====================== -Known Host: {{ zuul_traceroute_host }} +Known Host: {{ zuul_site_traceroute_host }} {{ zdi.traceroute_v6 }} {% endif %}