Locally override bad keystone default.

I935c5144728d04c59abaee9a515e249ef0d24477 in keystone added a default
that references a non-existing (and not needed paste.ini file).

We'll back this out when the bug in keystone is closed.

Closes-Bug: #1280692
Change-Id: I04c5c2f9863a5e16b2b51eef37042194e23d8f43
Fixup tripleo-cd fallout from the CI push.

We've created the file on cd-undercloud by hand, but folk bringing up
new regions need to know :)

Change-Id: I845cec379e0259b0001108d45399fce2511dc2a6
Merge "Locally override bad keystone default."
Merge "Fixup tripleo-cd fallout from the CI push."