puppet-heat instance_user duplication

[Dan Prince]

Looks like puppet-heat landed a patch today that also sets instance_user by default. This is causing CI failures:

Mar 06 21:41:32 ov-w3e45qzh6cn-0-aiekvctzpiry-controller-bpc2qsusv5t2 os-collect-config[837]: pe(Class[Heat]): The keystone_host parameter is deprecated. Please use auth_uri and identity_uri instead.\u001b[0m\n\u001b[1;31mWarning: Scope(Class[Heat]): The keystone_port parameter is deprecated. Please use auth_uri and identity_uri instead.\u001b[0m\n\u001b[1;31mWarning: Scope(Class[Heat]): The keystone_protocol parameter is deprecated. Please use auth_uri and identity_uri instead.\u001b[0m\n\u001b[1;31mError: Duplicate declaration: Heat_config[DEFAULT/instance_user] is already declared in file /etc/puppet/modules/heat/manifests/init.pp:537; cannot redeclare at /var/lib/heat-config/heat-config-puppet/4f681ed3-f26a-40c7-a57c-4982b8cf3049.pp:315 on node ov-w3e45qzh6cn-0-aiekvctzpiry-controller-bpc2qsusv5t2.novalocal\u001b[0m\n\u001b[1;31mError: Duplicate declaration: Heat_config[DEFAULT/instance_user] is already declared in file /etc/puppet/modules/heat/manifests/init.pp:537; cannot redeclare at /var/lib/heat-config/heat-config-

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/162377

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/162377
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=67fc92c5e4202362bd40db620ad5d4649f79f8dd
Submitter: Jenkins
Branch: master

commit 67fc92c5e4202362bd40db620ad5d4649f79f8dd
Author: Dan Prince <email address hidden>
Date: Fri Mar 6 22:09:05 2015 -0500

    puppet: set heat-user using class parameter

    The puppet-heat module just added a new class
    parameter to help manage instance_user today in
    I44fef59d3ed1f7851d8504855a7ae0d5460fdc84. This
    actually broke us because we were setting it manually
    via heat_config (puppet doesn't allow two settings).

    Change-Id: Ib25e8de8ca3849701d506a5d0c956a6f3317ac8a
    Closes-bug: #1429328