From 65aa706a44ea01430954d9f191e88042b870eba5 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 9 Jan 2019 16:23:00 +0000
Subject: [PATCH] Use kolla-ansible version to tag images

If building images, kolla currently uses its own version for their tag
by default.  This might not match the version of kolla-ansible, which is
what is used by default in kolla-ansible. This leads to the image not
being found.

This change uses kolla-ansible's version to tag locally built images.

Change-Id: I49c7afb9167d1e3f8a4470b6ebbb6ad6798d4996
---
 tools/setup_gate.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/setup_gate.sh b/tools/setup_gate.sh
index 971d1f76eb..e022906df0 100755
--- a/tools/setup_gate.sh
+++ b/tools/setup_gate.sh
@@ -52,12 +52,16 @@ EOF
         GATE_IMAGES+=",tacker,mistral,redis,barbican"
     fi
 
+    # Use the kolla-ansible tag rather than the kolla tag, since this is what
+    # kolla-ansible will use by default.
+    TAG=$(python -c "import pbr.version; print(pbr.version.VersionInfo('kolla-ansible'))")
     cat <<EOF | sudo tee /etc/kolla/kolla-build.conf
 [DEFAULT]
 include_header = /etc/kolla/header
 namespace = lokolla
 base = ${BASE_DISTRO}
 install_type = ${INSTALL_TYPE}
+tag = ${TAG}
 profile = gate
 registry = 127.0.0.1:4000
 push = true