diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-21 20:59:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-21 20:59:34 +0000 |
| commit | 60b83ae436cbe61514405602cd9eeb5da5ed56e1 (patch) | |
| tree | e95a021cf8b6511cc8020800f804d4408a68fb6c /puppet/manifests | |
| parent | 393db0231fa4b3b61b65c0ac6f031950e415d58d (diff) | |
| parent | 1d38b753672cbd41e24a092c26d7aa5f5e0e69c3 (diff) | |
Merge "Deploy Horizon with composable apache service"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 3a6370e4..9ebfb6d5 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -240,11 +240,6 @@ if hiera('step') >= 5 { Pacemaker::Resource::Service[$::aodh::params::listener_service_name]], } - # The next step is to include this class in puppet-tripleo profiles directly. - # We couldn't do it directly in puppet-tripleo, otherwise CI would have break because - # of Puppet duplicated resource. - include ::tripleo::profile::pacemaker::apache - #VSM if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') { pacemaker::resource::ocf { 'vsm-p' : |