From a670ffcf4bbff7adc6551e1f6a80ad20043738a3 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 22 Sep 2017 11:13:56 -0500
Subject: [PATCH] Finish transition to zuul_site_image_manifest_files
The compat code was causing a loop and is also no longer needed.
Change-Id: I05025d95ecbdcada2511c4803b40a81bb0ef34de
---
roles/validate-host/defaults/main.yaml | 5 +++--
roles/validate-host/vars/main.yaml | 3 ---
2 files changed, 3 insertions(+), 5 deletions(-)
delete mode 100644 roles/validate-host/vars/main.yaml
diff --git a/roles/validate-host/defaults/main.yaml b/roles/validate-host/defaults/main.yaml
index 0784d5d0e..80ced4067 100644
--- a/roles/validate-host/defaults/main.yaml
+++ b/roles/validate-host/defaults/main.yaml
@@ -1,2 +1,3 @@
-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:
+ - /etc/dib-builddate.txt
+ - /etc/image-hostname.txt
diff --git a/roles/validate-host/vars/main.yaml b/roles/validate-host/vars/main.yaml
deleted file mode 100644
index 47368c9c8..000000000
--- a/roles/validate-host/vars/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-validate_host_default_image_manifest_files:
- - /etc/dib-builddate.txt
- - /etc/image-hostname.txt