undercloud domain creation broken by puppet-heat

[Steven Hardy]

https://review.openstack.org/#/c/239680/ landed, and now we see:

2015-11-19 17:47:03.167 | Warning: Scope(Class[Concat::Setup]): concat::setup is deprecated as a public API of the concat module and should no longer be directly included in the manifest.
2015-11-19 17:47:03.687 | Warning: Scope(Class[Swift::Storage::All]): The default for the mount_check parameter will change from false to true in the next release to match upstream. To disable this warning, set mount_check=false.
2015-11-19 17:47:04.180 | Warning: Scope(Class[Ceilometer::Expirer]): Parameter "time_to_live" is deprecated and will be removed in next release. Use metering_time_to_live in "ceilometer" class instead.
2015-11-19 17:47:05.496 | Warning: Scope(Neutron::Plugins::Ml2::Type_driver[local]): local type_driver is useful only for single-box, because it provides no connectivity between hosts
2015-11-19 17:47:05.833 | Warning: Scope(Swift::Storage::Server[6002]): The default for the mount_check parameter will change from false to true in the next release to match upstream. To disable this warning, set mount_check=false.
2015-11-19 17:47:05.934 | Warning: Scope(Swift::Storage::Server[6001]): The default for the mount_check parameter will change from false to true in the next release to match upstream. To disable this warning, set mount_check=false.
2015-11-19 17:47:05.978 | Warning: Scope(Swift::Storage::Server[6000]): The default for the mount_check parameter will change from false to true in the next release to match upstream. To disable this warning, set mount_check=false.
2015-11-19 17:47:07.265 | Error: Could not find resource 'Keystone_domain[heat_domain]' for relationship from 'Class[Keystone::Roles::Admin]' on node instack
2015-11-19 17:47:07.265 | Error: Could not find resource 'Keystone_domain[heat_domain]' for relationship from 'Class[Keystone::Roles::Admin]' on node instack

http://logs.openstack.org/47/246447/3/check-tripleo/gate-tripleo-ci-f21-ceph/1430913/console.html

http://logs.openstack.org/57/247657/2/check-tripleo/gate-tripleo-ci-f21-ceph/2963e5f/console.html

So, This patch appears to have broken us:
https://github.com/openstack/puppet-heat/commit/e7c472d053679490d8b225d2f5c1f591003b5b6e

I assume we need to do something different to this:
https://github.com/openstack/instack-undercloud/commit/d129dcb6ed2827d9c1d754b40b76907aac77c2af

[OpenStack Infra (hudson-openstack)]

Change abandoned by Giulio Fidente (<email address hidden>) on branch: master
Review: https://review.openstack.org/248041
Reason: There was a fix for this at Ic541f11978908f9344e5590f3961f0d31c04bb0c

[Steven Hardy (shardy)]

https://review.openstack.org/#/c/239707/ looks like it should fix this