Revert "Make keystone_pki less keystone specific"

This breaks the world due to parameters changing.

This reverts commit e5f844d126d6dbe6ad0b8a4dae5c2b314f5918a0.

Change-Id: Iad76855a02779018c2e2d3b0b65790ab9c7f7c99