Fix logging
Change-Id: Ia3ec87a01cf996cf0d18f0ca4ca091c14d35d22e
This commit is contained in:
parent
93e004fc22
commit
8b0372afe9
|
@ -126,9 +126,3 @@ service { $rsyslog::params::service_name:
|
|||
enable => true,
|
||||
}
|
||||
|
||||
firewall { '100 rsyslog' :
|
||||
dport => '514',
|
||||
proto => 'udp',
|
||||
action => 'accept',
|
||||
}
|
||||
|
||||
|
|
|
@ -11,6 +11,14 @@ $baremetal_network = get_network_role_property('ironic/baremetal', 'network')
|
|||
firewallchain { 'baremetal:filter:IPv4':
|
||||
ensure => present,
|
||||
} ->
|
||||
firewall { '100 allow rsyslog':
|
||||
chain => 'baremetal',
|
||||
source => $baremetal_network,
|
||||
destination => $baremetal_ipaddr,
|
||||
proto => 'udp',
|
||||
dport => '514',
|
||||
action => 'accept',
|
||||
} ->
|
||||
firewall { '101 allow TFTP':
|
||||
chain => 'baremetal',
|
||||
source => $baremetal_network,
|
||||
|
@ -19,7 +27,7 @@ firewall { '101 allow TFTP':
|
|||
dport => '69',
|
||||
action => 'accept',
|
||||
} ->
|
||||
firewall { '102 allow related':
|
||||
firewall { '900 allow related':
|
||||
chain => 'baremetal',
|
||||
source => $baremetal_network,
|
||||
destination => $baremetal_ipaddr,
|
||||
|
|
|
@ -32,7 +32,7 @@ $ActionQueueDequeueBatchSize 128
|
|||
$ActionResumeRetryCount -1
|
||||
$SystemLogRateLimitInterval 0 # disable rate limits for rsyslog
|
||||
|
||||
|
||||
$template RemoteLogIronic, "<%%pri%>%timestamp% %syslogtag:R,ERE,2,FIELD:(ironic/.*/)(.*)--end% %msg:::sp-if-no-1st-sp%%msg%\n"
|
||||
$template RemoteLogFile, "/var/log/remote/%syslogtag:R,ERE,1,DFLT:([A-Za-z][A-Za-z0-9_./-]*)--end%.log"
|
||||
|
||||
:FROMHOST, regex, "^[1-9]" -?RemoteLogFile;RemoteLog
|
||||
:FROMHOST, regex, "^[1-9]" -?RemoteLogFile;RemoteLogIronic
|
||||
|
|
Loading…
Reference in New Issue