Mitaka and Newton jobs broken on splay error

[Ben Nemec]

All mitaka and newton underclouds are failing with the following error:

[ERROR] Section end tag mismatch: splay}

There appears to be a typo in the mustache template for the splay option. It actually looks like:

{{/splay}

and should be

{{/splay}}

It's very confusing though. I see

# rpm -qf /usr/libexec/os-apply-config/templates/etc/os-collect-config.conf
python-heat-agent-0.0.1-0.20170426055943.2603dbe.el7.centos.noarch

but when I look at the heat-agents template it looks right: https://github.com/openstack/heat-agents/blob/master/heat-config/os-apply-config/etc/os-collect-config.conf

So I'm not sure where the bad template is coming from.

[Alex Schultz (alex-schultz)]

https://review.openstack.org/#/c/460215/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/460215
Committed: https://git.openstack.org/cgit/openstack/heat-templates/commit/?id=6d2659b468bab2630b1498f2f3ae6942ebd87828
Submitter: Jenkins
Branch: master

commit 6d2659b468bab2630b1498f2f3ae6942ebd87828
Author: Alex Schultz <email address hidden>
Date: Wed Apr 26 10:30:11 2017 -0600

    Fix splay config template

    The splay option was added in I88f623c9e8db9ed4a186918206a63faec8f7f673
    but was missing a trailing } which leads to parse errors. This fixes the
    parse errors.

    Change-Id: Ic5783220f5d027e0bde0080f50f9e10cbb68289f
    Closes-Bug: #1686455

[Emilien Macchi (emilienm)]

Alex, do we still need the alert? Do we need to backport it?

[Bogdan Dobrelya (bogdando)]

AFAICT, the original patch has no backports, so need no the fix. I think the alert mark can go now

[Alex Schultz (alex-schultz)]

No we appear to be using head in mitaka/newton. I left it open until the jobs passed on the next package build. I'm going to verify those jobs are fixed.

[Ben Nemec (bnemec)]

Mitaka and Newton jobs are passing again, so I think we can close this out for tripleo.