From 48c643abbe254209b2576096e9ec209edd6ad578 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 22 Aug 2019 13:48:41 +0100
Subject: [PATCH] Include branch name in URL for IPA on master

While CoreOS images have a copy with and without the -master suffix,
tinyipa images which kayobe-config-dev has switched to, do not.

This change includes the branch name always.

https://tarballs.openstack.org/ironic-python-agent/coreos/files/

TrivialFix

Change-Id: Iff1504d17ecefd901d1c29c748a776a69a45b304
---
 ansible/group_vars/all/ipa | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ansible/group_vars/all/ipa b/ansible/group_vars/all/ipa
index e47cb2ffd..3d4228495 100644
--- a/ansible/group_vars/all/ipa
+++ b/ansible/group_vars/all/ipa
@@ -61,8 +61,7 @@ ipa_build_dib_git_elements: []
 
 # Suffix of upstream Ironic deployment image files. Default is based on
 # {{ openstack_branch }}.
-ipa_images_upstream_url_suffix: >-
-  {% if openstack_branch != 'master' %}-{{ openstack_branch | replace('/', '-') }}{% endif %}
+ipa_images_upstream_url_suffix: "-{{ openstack_branch | replace('/', '-') }}"
 
 # Name of Ironic deployment kernel image to register in Glance.
 ipa_images_kernel_name: "ipa.vmlinuz"