diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-11-11 02:21:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-11-11 02:21:17 +0000 |
| commit | 9d5431a14f1f3a440fbbc5afa9f53a8ed476b881 (patch) | |
| tree | 130a900fc2a7f11874d53939b6185dd712d88840 /puppet/manifests/overcloud_controller.pp | |
| parent | ac680bff5f8ece671686b7ebffa22eaf17b43474 (diff) | |
| parent | f161c8435a4ff6e3d4ed3798351092d03d2cd4ac (diff) | |
Merge "Revert "Manage keystone initialization directly in t-h-t manifests""
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 06fffdca..695cb519 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -485,15 +485,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')]) |