From 1d38b753672cbd41e24a092c26d7aa5f5e0e69c3 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Wed, 20 Jul 2016 16:17:05 -0400 Subject: 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 --- puppet/manifests/overcloud_controller_pacemaker.pp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'puppet/manifests') 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' : -- cgit 1.2.3-korg