scenario002 fails after adding support to ec2api

Since support for ec2api was added in https://review.openstack.org/#/c/356442/, scenario002 is failing in RDO-CI jobs as in https://ci.centos.org/job/weirdo-master-promote-puppet-openstack-scenario002/611/ .

Error is:

15:43:32 Error: /Stage[main]/Tempest/Tempest_ec2_credentials[ec2_test_creds]/ensure: change from absent to present failed: Execution of '/usr/bin/openstack ec2 credentials create --format shell --user ec2api-tester --project openstack' returned 1: Cannot use v2 authentication with domain scope

I've reproduced it locally, and the issue seems to be that, when puppet tries to create the tempest_ec2_credential, /root/openrc file doesn't exist yet.

From local p-o-i execution:

Error: /Stage[main]/Tempest/Tempest_ec2_credentials[ec2_test_creds]/ensure: change from absent to present failed: Execution of '/bin/openstack ec2 credentials create --format shell --user ec2api-tester --project openstack' returned 1: Cannot use v2 authentication with domain scope
Notice: /Stage[main]/Openstack_integration::Provision/Glance_image[cirros]/ensure: created
Notice: /Stage[main]/Keystone::Disable_admin_token_auth/Ini_subsetting[public_api/admin_token_auth]/ensure: removed
Info: /Stage[main]/Keystone::Disable_admin_token_auth/Ini_subsetting[public_api/admin_token_auth]: Scheduling refresh of Exec[restart_keystone]
Notice: /Stage[main]/Openstack_integration::Provision/Neutron_network[public]/ensure: created
Notice: /Stage[main]/Tempest/Tempest_neutron_net_id_setter[public_network_id]/ensure: created
Notice: /Stage[main]/Keystone::Disable_admin_token_auth/Ini_subsetting[api_v3/admin_token_auth]/ensure: removed
Info: /Stage[main]/Keystone::Disable_admin_token_auth/Ini_subsetting[api_v3/admin_token_auth]: Scheduling refresh of Exec[restart_keystone]
Notice: /Stage[main]/Openstack_extras::Auth_file/File[/root/openrc]/ensure: defined content as '{md5}dd653f2d2a149ffafa39f349c67cf103'
Notice: /Stage[main]/Keystone::Disable_admin_token_auth/Ini_subsetting[admin_api/admin_token_auth]/ensure: removed
Info: /Stage[main]/Keystone::Disable_admin_token_auth/Ini_subsetting[admin_api/admin_token_auth]: Scheduling refresh of Exec[restart_keystone]
Notice: /Stage[main]/Keystone/Exec[restart_keystone]: Triggered 'refresh' from 3 events
...

If i run following test manifest after puppet execution is done, it works fine:

tempest_ec2_credentials { 'ec2_test_creds':
  ensure => present,
  tempest_conf_path => "/tmp/openstack/tempest/etc/tempest.conf",
  user => 'ec2api-tester',
  project => 'openstack',
}