diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-07-20 15:58:15 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-07-20 16:02:16 -0400 |
| commit | 279a2a0cea6c8d58bea308266f90a1a4db7edd6f (patch) | |
| tree | 774193a29850406c533c0afc5d1f5689b028b149 /puppet/manifests | |
| parent | 35aceb0876b51fe990e369f900fd2dd3d45e6dfa (diff) | |
Include new apache pacemaker profile
In https://review.openstack.org/345013 we are working to create a new
profile for Apache with Pacemaker. We can't include this class in the
profiles (keystone, etc) yet because it would cause a duplicate resource
error in Puppet catalog.
So we need to first clean the code in overcloud_controller_pacemaker.pp
and include the new class, and then we can either create a new
composable service in THT for apache or include the class directly in
puppet-tripleo profiles that need it (keystone, horizon, etc).
Change-Id: I1222fbf099b4268e33ec8ee32380f0a6b1d5e1af
Depends-On: I9ae6cee2bfb0f8974d41d700454cfde2df06c2d1
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index c0f219ca..17b64cb2 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -245,14 +245,10 @@ if hiera('step') >= 5 { Pacemaker::Resource::Service[$::aodh::params::listener_service_name]], } - # Horizon and Keystone - pacemaker::resource::service { $::apache::params::service_name: - clone_params => 'interleave=true', - verify_on_create => true, - require => [File['/etc/keystone/ssl/certs/ca.pem'], - File['/etc/keystone/ssl/private/signing_key.pem'], - File['/etc/keystone/ssl/certs/signing_cert.pem']], - } + # 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') { |