Reviewed: https://review.opendev.org/670082 Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=d6bd20d5b46d7ede598e022f0d34814c8dbe8a66 Submitter: Zuul Branch: stable/stein
commit d6bd20d5b46d7ede598e022f0d34814c8dbe8a66 Author: Emilien Macchi <email address hidden> Date: Wed Jul 10 10:46:25 2019 -0400
Stein: Re-enable container auth support
Squash of the revert of the revert + the fix
1) Revert "Revert "Add container engine authentication support""
This reverts commit ac5145c28d02e54453ab69d32237ca2b81e2568c.
2) Convert the heat json format to a py dict
This change converts a heat json format option to a py dict within a jinja expresion.
Closes-Bug: #1835657 Related-Bug: #1833584 Change-Id: I4b44214cd7007dc31ad5f4e0a0d7a3a531a9f20e Signed-off-by: Kevin Carter <email address hidden> (cherry picked from commit 6e07f2a7675b2dd8ff340a24823eb3808d2b07b3)
Reviewed: https:/ /review. opendev. org/670082 /git.openstack. org/cgit/ openstack/ tripleo- heat-templates/ commit/ ?id=d6bd20d5b46 d7ede598e022f0d 34814c8dbe8a66
Committed: https:/
Submitter: Zuul
Branch: stable/stein
commit d6bd20d5b46d7ed e598e022f0d3481 4c8dbe8a66
Author: Emilien Macchi <email address hidden>
Date: Wed Jul 10 10:46:25 2019 -0400
Stein: Re-enable container auth support
Squash of the revert of the revert + the fix
1) Revert "Revert "Add container engine authentication support""
This reverts commit ac5145c28d02e54 453ab69d32237ca 2b81e2568c.
2) Convert the heat json format to a py dict
This change converts a heat json format option to a py dict within
a jinja expresion.
Closes-Bug: #1835657 c31ad5f4e0a0d7a 3a531a9f20e 8ff340a24823eb3 808d2b07b3)
Related-Bug: #1833584
Change-Id: I4b44214cd7007d
Signed-off-by: Kevin Carter <email address hidden>
(cherry picked from commit 6e07f2a7675b2dd