The previous fix, 589ac8ac0d5a14ce4aa831892d3b0a4a31e29674 was not fully
working as intended because during the templating of the container image
prepare entry, the setting for default_tag was being lost.
This fix simplifies the handling by just checking the initial
mapping_args for the presence of a tag key to determine if the
default_tag flag should be set.
Change-Id: Idfebf62e0e10b709367cfcb6977cf18550a4a4b0
Partial-Bug: #1886547
Signed-off-by: James Slagle <email address hidden>
(cherry picked from commit b744db900f51416da25ccf923b2105f43f528720)
(cherry picked from commit 66cdee5a0fd350eaef805eed664a7f71cf5046a2)
Reviewed: https:/ /review. opendev. org/750109 /git.openstack. org/cgit/ openstack/ tripleo- common/ commit/ ?id=e53f6f73e30 8899a2a79ca11b4 d3c4a9849c1ac2
Committed: https:/
Submitter: Zuul
Branch: stable/train
commit e53f6f73e308899 a2a79ca11b4d3c4 a9849c1ac2
Author: James Slagle <email address hidden>
Date: Fri Sep 4 16:45:51 2020 -0400
Fix handling of default_tag
The previous fix, 589ac8ac0d5a14c e4aa831892d3b0a 4a31e29674 was not fully
working as intended because during the templating of the container image
prepare entry, the setting for default_tag was being lost.
This fix simplifies the handling by just checking the initial
mapping_args for the presence of a tag key to determine if the
default_tag flag should be set.
Change-Id: Idfebf62e0e10b7 09367cfcb6977cf 18550a4a4b0 da25ccf923b2105 f43f528720) aef805eed664a7f 71cf5046a2)
Partial-Bug: #1886547
Signed-off-by: James Slagle <email address hidden>
(cherry picked from commit b744db900f51416
(cherry picked from commit 66cdee5a0fd350e