deploy hook fails due to "KeyError: 'user-domain-name'" despite juju trust cmd

This is on an icehouse cloud, so Keystone v2.0 - which doesn't seem to have a concept of domains.

Upon running 'juju trust openstack-integrator", I get a hook failure with KeyError: 'user-domain-name'.

I've attempted to work around this by manually setting the 'credentials' config setting, but:

> The credentials must contain the following keys: auth-url, username, password,
> project-name, user-domain-name, and project-domain-name.

And since we're on Keystone v2.0, I don't have a user-domain-name or a project-domain-name.

Setting those to dummy values (or "default, or "Default") seems to always result in a blocked state:

blocked: invalid value for credentials config