container-puppet.py errors if the step config is empty

[Alex Schultz]

If the step json for container-puppet.py is empty (or null), the deployment execution fails with:

        "Traceback (most recent call last):",
        " File \"/var/lib/container-puppet/container-puppet.py\", line 555, in <module>",
        " for k, v in iter(infile_data.items()):",
        "AttributeError: 'NoneType' object has no attribute 'items'"

We should check the contents of the json parse to ensure it's not None prior to trying to consume it.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/657885

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/657885
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=055d15f9288f7c49670c47e847ead564d8b2d5de
Submitter: Zuul
Branch: master

commit 055d15f9288f7c49670c47e847ead564d8b2d5de
Author: Alex Schultz <email address hidden>
Date: Wed May 8 14:33:06 2019 -0600

    Gracefully handle empty config json data

    If the json config data is set to Null, the current code throws an error
    because we attempt to use .items() on the parsed result. We should just
    treat and empty file as an empty dict so the code properly continues.

    Change-Id: I02bb2ce5359aeec1e600b0c0f04fb72c7a335407
    Closes-Bug: #1828295

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/stein
Review: https://review.opendev.org/658291

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/658291
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=039ce1c3caf4ee7ff0160c6fceb60e0ed8d444d1
Submitter: Zuul
Branch: stable/stein

commit 039ce1c3caf4ee7ff0160c6fceb60e0ed8d444d1
Author: Alex Schultz <email address hidden>
Date: Wed May 8 14:33:06 2019 -0600

    Gracefully handle empty config json data

    If the json config data is set to Null, the current code throws an error
    because we attempt to use .items() on the parsed result. We should just
    treat and empty file as an empty dict so the code properly continues.

    Change-Id: I02bb2ce5359aeec1e600b0c0f04fb72c7a335407
    Closes-Bug: #1828295
    (cherry picked from commit 055d15f9288f7c49670c47e847ead564d8b2d5de)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 11.0.0 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 10.6.0 release.