diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-10-12 08:02:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-10-12 08:02:58 +0000 |
| commit | ceaecbd9d9dae2fc32539e85ae42d129f506a02b (patch) | |
| tree | 18fa2b19d9dcb4afb2c745807d17f15682ab403f /puppet | |
| parent | d4cb01089b5cfd78a663995d59a1ca804acb0769 (diff) | |
| parent | 50a2b04d976c84d06b8090d12f475a68825e1dad (diff) | |
Merge "Ensure httpd is not enabled by puppet on system boot"
Diffstat (limited to 'puppet')
| -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 f5a89582..b8fa89f8 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -872,7 +872,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' |