From 12cc9a2e50ca52c5e9f7d576fe8c0edf7b6fb99d Mon Sep 17 00:00:00 2001
From: Marios Andreou <marios@redhat.com>
Date: Mon, 17 Dec 2018 11:54:13 +0200
Subject: [PATCH] Use buildah only for stein onwards, fixes rocky

container_build_tool should be set to buildah only for stein or
newer. This was added in https://review.openstack.org/608452

Testing with https://review.openstack.org/625535

Change-Id: I5dc2dffbc93c4af2bc403ba6ab0c6e9c731865ea
Related-Bug: #1808767
---
 .../templates/containers-prepare-parameter.yaml.j2            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2 b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
index 62f448a84..e438c0882 100644
--- a/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
+++ b/roles/undercloud-deploy/templates/containers-prepare-parameter.yaml.j2
@@ -11,8 +11,10 @@ parameter_defaults:
     modify_vars:
       tasks_from: yum_update.yml
       yum_repos_dir_path: /etc/yum.repos.d
-      container_build_tool: buildah
       update_repo: "{{ update_containers_repo }}"
+{% if  release not in ['newton', 'ocata', 'pike', 'queens', 'rocky'] %}
+      container_build_tool: buildah
+{% endif %}
 {% endif %}
     set:
       tag: "{{ container_build_id }}"