The oslo-incubator patch needed here is: https://review.openstack.org/#/c/98848/
Heat master: https://review.openstack.org/98894 Heat stable/icehouse: https://review.openstack.org/98895
Note: this issue is fixed, please see bug 1106854 comment 12 for details.
I am waiting for the next puddle so I can see that this fix was introduced there.
This is intruduced in the latest puddle.
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. http://rhn.redhat.com/errata/RHEA-2014-0849.html