diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2015-10-09 13:31:14 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2015-10-09 13:31:14 +0200 |
| commit | 50a2b04d976c84d06b8090d12f475a68825e1dad (patch) | |
| tree | 65da10358c235c19879c711c317d961a43f4b0e5 /puppet/manifests/overcloud_controller_pacemaker.pp | |
| parent | 2089e841a0df746ad94c92ca7ed4aba953353094 (diff) | |
Ensure httpd is not enabled by puppet on system boot
The httpd daemon will be started and managed by Pacemaker, it should
not be enabled by puppet. Ideally, it shouldn't be started either
but it seems it isn't possible with horizon and apache mod_wsgi [1].
1. https://bugzilla.redhat.com/show_bug.cgi?id=1247547
Change-Id: I8a1b23c4ea27ac86385314f6cfde8c49d0879969
Co-Authored-By: marios andreou (marios@redhat.com)
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 0c73dd2f..c8a84c93 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -871,7 +871,10 @@ if hiera('step') >= 3 { # httpd/apache and horizon # NOTE(gfidente): server-status can be consumed by the pacemaker resource agent - include ::apache + class { '::apache' : + service_enable => false, + # service_manage => false, # <-- not supported with horizon&apache mod_wsgi? + } include ::apache::mod::status if 'cisco_n1kv' in hiera('neutron_mechanism_drivers') { $_profile_support = 'cisco' |