From 313b085c37411d22af62ba8dbc2d18840b9a8a7d Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Fri, 16 Feb 2018 15:37:48 +1300
Subject: [PATCH] Include a default for tag_from_label

This allows discovery to be done by default for the workflow driven
prepare. Both the undercloud install and overcloud deploy will use
this value.

Change-Id: I9a39dc1fe269abeb9e0bac19f47b2bcb420a974f
Blueprint: containerized-undercloud
Blueprint: container-prepare-workflow
---
 tripleo_common/image/kolla_builder.py            | 1 +
 tripleo_common/tests/image/test_kolla_builder.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/tripleo_common/image/kolla_builder.py b/tripleo_common/image/kolla_builder.py
index bc1fb49ff..2d408f740 100644
--- a/tripleo_common/image/kolla_builder.py
+++ b/tripleo_common/image/kolla_builder.py
@@ -33,6 +33,7 @@ CONTAINER_IMAGES_DEFAULTS = {
     'ceph_tag': 'tag-stable-3.0-luminous-centos-7',
     'name_prefix': 'centos-binary-',
     'name_suffix': '',
+    'tag_from_label': 'rdo_version',
     'tag': 'current-tripleo',
     'neutron_driver': None,
     'logging': 'files'
diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py
index 106ee03a5..7fa22d422 100644
--- a/tripleo_common/tests/image/test_kolla_builder.py
+++ b/tripleo_common/tests/image/test_kolla_builder.py
@@ -172,6 +172,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'name_prefix': 'centos-binary-',
                 'name_suffix': '',
                 'tag': 'current-tripleo',
+                'tag_from_label': 'rdo_version',
                 'neutron_driver': None
             },
             builder.container_images_template_inputs()
@@ -187,6 +188,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
                 'name_prefix': 'prefix-',
                 'name_suffix': '-suffix',
                 'tag': 'master',
+                'tag_from_label': 'rdo_version',
                 'neutron_driver': 'ovn'
             },
             builder.container_images_template_inputs(