openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Sync httpd vhost settings in between pcmk and non-pcmk scenarios"

Browse Source
This commit is contained in:
Jenkins
2015-10-21 13:42:29 +00:00
committed by Gerrit Code Review
parent 88efef101e 6c6384e901
commit 42db2b219b
3 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
puppet/hieradata/controller.yaml
View File

@@ -92,6 +92,9 @@ pacemaker::resource_defaults::defaults:
# horizon # horizon
horizon::cache_backend: django.core.cache.backends.memcached.MemcachedCache horizon::cache_backend: django.core.cache.backends.memcached.MemcachedCache
horizon::django_session_engine: 'django.contrib.sessions.backends.cache' horizon::django_session_engine: 'django.contrib.sessions.backends.cache'
horizon::vhost_extra_params:
add_listen: false
priority: 10
# mysql # mysql
mysql::server::manage_config_file: true mysql::server::manage_config_file: true

2
puppet/manifests/overcloud_controller.pp
View File

@@ -461,10 +461,8 @@ if hiera('step') >= 3 {
$_profile_support = 'None' $_profile_support = 'None'
} }
$neutron_options = {'profile_support' => $_profile_support } $neutron_options = {'profile_support' => $_profile_support }
$vhost_params = { add_listen => false }
class { 'horizon': class { 'horizon':
cache_server_ip => hiera('memcache_node_ips', '127.0.0.1'), cache_server_ip => hiera('memcache_node_ips', '127.0.0.1'),
vhost_extra_params => $vhost_params,
neutron_options => $neutron_options, neutron_options => $neutron_options,
} }

6
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@@ -883,14 +883,8 @@ if hiera('step') >= 3 {
$_profile_support = 'None' $_profile_support = 'None'
} }
$neutron_options = {'profile_support' => $_profile_support } $neutron_options = {'profile_support' => $_profile_support }
$vhost_params = {
add_listen => false,
priority => 10,
}
class { 'horizon': class { 'horizon':
cache_server_ip => hiera('memcache_node_ips', '127.0.0.1'), cache_server_ip => hiera('memcache_node_ips', '127.0.0.1'),
vhost_extra_params => $vhost_params,
server_aliases => $::hostname,
neutron_options => $neutron_options, neutron_options => $neutron_options,
} }