From 27c5e8d641da0f55908c723874e401c2ea541372 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Mon, 8 Apr 2019 08:51:01 -0400
Subject: [PATCH] Don't run zuul_debug_info_enabled under python2.6
This is because it is not python2.6 compatible, where supported
versions of ansible still allow for python2.6.
Change-Id: Ie1b3a30e1d6b5206ba81558a34937071a951ce15
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
roles/validate-host/tasks/main.yaml | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/roles/validate-host/tasks/main.yaml b/roles/validate-host/tasks/main.yaml
index 08cadfcf0..98b252d25 100644
--- a/roles/validate-host/tasks/main.yaml
+++ b/roles/validate-host/tasks/main.yaml
@@ -19,15 +19,19 @@
dest: "{{ zuul_info_dir }}/host-info.{{ inventory_hostname }}.yaml"
src: templates/host-info.j2
-- name: Collect information about zuul worker
- zuul_debug_info:
- image_manifest: "{{ zuul_site_image_manifest|default(omit) }}"
- image_manifest_files: "{{ zuul_site_image_manifest_files|default(omit) }}"
- traceroute_host: "{{ zuul_site_traceroute_host|default(omit) }}"
- register: zdi
+- name: zuul_debug_info block
+ block:
+ - name: Collect information about zuul worker
+ zuul_debug_info:
+ image_manifest: "{{ zuul_site_image_manifest|default(omit) }}"
+ image_manifest_files: "{{ zuul_site_image_manifest_files|default(omit) }}"
+ traceroute_host: "{{ zuul_site_traceroute_host|default(omit) }}"
+ register: zdi
-- name: Write out all zuul information for each host
- delegate_to: localhost
- template:
- dest: "{{ zuul_info_dir }}/zuul-info.{{ inventory_hostname }}.txt"
- src: templates/zuul-info.j2
+ - name: Write out all zuul information for each host
+ delegate_to: localhost
+ template:
+ dest: "{{ zuul_info_dir }}/zuul-info.{{ inventory_hostname }}.txt"
+ src: templates/zuul-info.j2
+
+ when: ansible_python_version is version('2.7', '>=')