Default domain not calculated when no keystone_user/keystone_tenant/keystone_user_role is defined.

[Sofer Athlan-Guyot]

The keystone_user and keystone_tenant name should be :

 user::domain
 tenant::domain

I call this the long form.

When they are in the default domain, it should be:

 user
 tenant

This is the short form.

If no keystone_user/keystone_tenant/kestone_user_role is defined in the catalog then the resources are always in the long form even if they are in the "Default" domain. We end up with:

  user::Default
  tenant::Default

This is what happen in https://bugs.launchpad.net/puppet-neutron/+bug/1515787, where there is a call to Puppet::Type.type(:keystone_tenant).instances.find and no user/tenant/user_role is defined in the catalogue.

This is contrary to what has been described here https://review.openstack.org/#/c/219127/ and which is expected to be the default domain behaviour.

The expected behaviour is that we should fall back to 'Default', when no domain is specified, as the default domain.

[Sofer Athlan-Guyot (sofer-athlan-guyot)]

This https://bugs.launchpad.net/puppet-heat/+bug/1516299 seems related.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/247063
Committed: https://git.openstack.org/cgit/openstack/puppet-keystone/commit/?id=961c64e143b5792d935d5d1986e31a84d2081f57
Submitter: Jenkins
Branch: master

commit 961c64e143b5792d935d5d1986e31a84d2081f57
Author: Sofer Athlan-Guyot <email address hidden>
Date: Wed Nov 18 18:38:50 2015 +0100

    Fix default domain.

    After the move to composite namevar a problem could occur if another
    module was using indirection to find resource by name.

    If the manifest didn't have any
    keystone_user/keystone_tenant/keystone_user_role definition, then, the
    'Default' domain would be appended to the name.

    This patch, fix that by simplifying the rule for calculating the default
    domain.

    It now strictly follows what is described there https://review.openstack.org/#/c/219127/

    Change-Id: Ic2efb51fe76d055307c8c27fa79015764417160b
    Closes-Bug: #1517187