diff options
| author |   Ben Nemec <openstack@nemebean.com> | 2015-11-04 16:55:34 +0000 |
|---|---|---|
| committer | Ben Nemec <openstack@nemebean.com> | 2015-11-04 16:55:34 +0000 |
| commit | f161c8435a4ff6e3d4ed3798351092d03d2cd4ac (patch) | |
| tree | 0a1fdb8d66d1dcf973a123c569a6c031c171e791 /puppet/manifests/overcloud_controller.pp | |
| parent | 86d6c1ddc76bad423194e789ffb5474e4e12960e (diff) | |
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
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 96302f2e..813309e4 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -484,15 +484,6 @@ if hiera('step') >= 3 { if hiera('step') >= 4 { include ::keystone::cron::token_flush - - include ::ceilometer::keystone::auth - include ::cinder::keystone::auth - include ::glance::keystone::auth - include ::heat::keystone::auth - include ::neutron::keystone::auth - include ::nova::keystone::auth - include ::swift::keystone::auth - } #END STEP 4 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')]) |