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_pacemaker.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_pacemaker.pp')
-rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index b80f2c79..91bc1b14 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -1565,27 +1565,6 @@ if hiera('step') >= 5 { } -> class {'::keystone::endpoint' : require => Pacemaker::Resource::Service[$::keystone::params::service_name], - } -> - class { '::ceilometer::keystone::auth' : - require => Pacemaker::Resource::Service[$::keystone::params::service_name], - } -> - class { '::cinder::keystone::auth' : - require => Pacemaker::Resource::Service[$::keystone::params::service_name], - } -> - class { '::glance::keystone::auth' : - require => Pacemaker::Resource::Service[$::keystone::params::service_name], - } -> - class { '::heat::keystone::auth' : - require => Pacemaker::Resource::Service[$::keystone::params::service_name], - } -> - class { '::neutron::keystone::auth' : - require => Pacemaker::Resource::Service[$::keystone::params::service_name], - } -> - class { '::nova::keystone::auth' : - require => Pacemaker::Resource::Service[$::keystone::params::service_name], - } -> - class { '::swift::keystone::auth' : - require => Pacemaker::Resource::Service[$::keystone::params::service_name], } } |