x/compass-adapters
Code Issues Proposed changes

Log haproxy to rsyslog

Browse Source 
Also increase the timeouts to see if any more Gateway timeout
failure in tempest.
Fix a bug in hosts snipet and also make log from haproxy tagged
with same hostname used by anamon.

Change-Id: I02ca18bb5ce0cdcd8a496672cb1bb5af179745be
This commit is contained in:
Xinyu Zhao 2014-04-24 02:16:28 +00:00
parent 893a10eadf
commit 46fb86bffe
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chef/cookbooks/haproxy/attributes/default.rb
View File

@ -56,11 +56,11 @@ default['haproxy']['stats_socket_user'] = node['haproxy']['user']
default['haproxy']['stats_socket_group'] = node['haproxy']['group'] default['haproxy']['stats_socket_group'] = node['haproxy']['group']
default['haproxy']['pid_file'] = "/var/run/haproxy.pid" default['haproxy']['pid_file'] = "/var/run/haproxy.pid"
default['haproxy']['defaults_options'] = ["tcpka", "httpchk", "tcplog"] default['haproxy']['defaults_options'] = ["tcpka", "httpchk", "tcplog", "httplog"]
default['haproxy']['x_forwarded_for'] = false default['haproxy']['x_forwarded_for'] = false
default['haproxy']['defaults_timeouts']['connect'] = "5s" default['haproxy']['defaults_timeouts']['connect'] = "5s"
default['haproxy']['defaults_timeouts']['client'] = "50s" default['haproxy']['defaults_timeouts']['client'] = "100s"
default['haproxy']['defaults_timeouts']['server'] = "50s" default['haproxy']['defaults_timeouts']['server'] = "100s"
default['haproxy']['cookie'] = nil default['haproxy']['cookie'] = nil
default['haproxy']['user'] = "haproxy" default['haproxy']['user'] = "haproxy"

6
chef/cookbooks/haproxy/templates/default/haproxy.cfg.erb
View File

@ -1,7 +1,7 @@
global global
log 127.0.0.1 local0 #log 127.0.0.1 local0
log 127.0.0.1 local1 notice log 127.0.0.1 local4 notice
#log loghost local0 info log 127.0.0.1 local4 info
daemon daemon
maxconn <%= node['haproxy']['global_max_connections'] %> maxconn <%= node['haproxy']['global_max_connections'] %>
#debug #debug

18
cobbler/snippets/hosts
View File

@ -1,9 +1,9 @@
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 127.0.0.1 $system_name localhost localhost.localdomain localhost4 localhost4.localdomain4
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 ::1 $system_name localhost localhost.localdomain localhost6 localhost6.localdomain6
#for $iname, $idata in $interfaces.items() # #for $iname, $idata in $interfaces.items()
#set $ip = $idata.get("ip_address", "") # #set $ip = $idata.get("ip_address", "")
#if $hostname != "" and $ip != "" # #if $hostname != "" and $ip != ""
$ip $hostname # $ip $hostname
#end if # #end if
#end for # #end for
# $compass_ip $compass_hostname # # $compass_ip $compass_hostname

2
cobbler/snippets/post_install_network_config
View File

@ -83,7 +83,7 @@ mv /etc/sysconfig/network.cobbler /etc/sysconfig/network
/bin/hostname $hostname /bin/hostname $hostname
#end if #end if
cat << EOL /etc/hosts cat << EOL > /etc/hosts
$SNIPPET('hosts') $SNIPPET('hosts')
EOL EOL