diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-07-20 16:17:05 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-07-21 13:41:14 +0000 |
| commit | 1d38b753672cbd41e24a092c26d7aa5f5e0e69c3 (patch) | |
| tree | 1988bdc0449482a49a703d83ceeb37211c60353d /puppet/manifests | |
| parent | 541631ac9092910a42f51bfbc2b7314d76299d05 (diff) | |
Deploy Horizon with composable apache service
Deploy Horizon with composable apache service and don't include:
::tripleo::profile::pacemaker::apache
Because it's already included in the profiles in puppet-tripleo.
Change-Id: I5382d5cc95ba10805019142a9a223dbd4a4b8074
Depends-On: Id28c618133e53e28dfac7e3e9cf9f5f5a6b2421a
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 17b64cb2..276c2daa 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -245,11 +245,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' : |