heat: manage heat user role before openrc
heat: manage heat user role before openrc

When /root/openrc is present, Puppet catalog will try to use it.
Though to use openrc, we need the admin user role in place otherwise
authentification will fail.

This patch makes sure the right orchestration happens.

Depends-On: I8a5ba016fc788bda1cd3f3d7666a78ba219d3ed3
Change-Id: I3ba651de5b40c49ee851a525424fb934f7a2575a

openstack/puppet-openstack-integration,openstack/puppet-openstack-integration,openstack/puppet-openstack-integration