Revert "Manage keystone initialization directly in t-h-t manifests"
authorBen Nemec <openstack@nemebean.com>
Wed, 4 Nov 2015 16:55:34 +0000 (16:55 +0000)
committerBen Nemec <openstack@nemebean.com>
Wed, 4 Nov 2015 16:55:34 +0000 (16:55 +0000)
commitf161c8435a4ff6e3d4ed3798351092d03d2cd4ac
tree0a1fdb8d66d1dcf973a123c569a6c031c171e791
parent86d6c1ddc76bad423194e789ffb5474e4e12960e
Revert "Manage keystone initialization directly in t-h-t manifests"

This reverts commit 86d6c1ddc76bad423194e789ffb5474e4e12960e.

This likely has an impact on upgrades, and since we don't
have an upgrade CI job yet I'm concerned that we may have
just broken ourselves.  I would prefer to wait to merge this
until the CI job is in place.

Change-Id: Ib2366cb4b40471a28122f6e9955da9bdb31a53fb
puppet/controller.yaml
puppet/hieradata/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp