Browse Source

Fix logging

Change-Id: Ia3ec87a01cf996cf0d18f0ca4ca091c14d35d22e
Andrey Shestakov 3 years ago
parent
commit
8b0372afe9

+ 0
- 6
deployment_scripts/puppet/manifests/ironic-conductor.pp View File

@@ -126,9 +126,3 @@ service { $rsyslog::params::service_name:
126 126
   enable  => true,
127 127
 }
128 128
 
129
-firewall { '100 rsyslog' :
130
-  dport   => '514',
131
-  proto   => 'udp',
132
-  action  => 'accept',
133
-}
134
-

+ 9
- 1
deployment_scripts/puppet/manifests/network-conductor.pp View File

@@ -11,6 +11,14 @@ $baremetal_network = get_network_role_property('ironic/baremetal', 'network')
11 11
 firewallchain { 'baremetal:filter:IPv4':
12 12
   ensure => present,
13 13
 } ->
14
+firewall { '100 allow rsyslog':
15
+  chain  => 'baremetal',
16
+  source => $baremetal_network,
17
+  destination => $baremetal_ipaddr,
18
+  proto  => 'udp',
19
+  dport => '514',
20
+  action => 'accept',
21
+} ->
14 22
 firewall { '101 allow TFTP':
15 23
   chain  => 'baremetal',
16 24
   source => $baremetal_network,
@@ -19,7 +27,7 @@ firewall { '101 allow TFTP':
19 27
   dport => '69',
20 28
   action => 'accept',
21 29
 } ->
22
-firewall { '102 allow related':
30
+firewall { '900 allow related':
23 31
   chain  => 'baremetal',
24 32
   source => $baremetal_network,
25 33
   destination => $baremetal_ipaddr,

+ 2
- 2
deployment_scripts/puppet/modules/ironic/templates/55-server-ironic.conf.erb View File

@@ -32,7 +32,7 @@ $ActionQueueDequeueBatchSize 128
32 32
 $ActionResumeRetryCount -1
33 33
 $SystemLogRateLimitInterval 0   # disable rate limits for rsyslog
34 34
 
35
-
35
+$template RemoteLogIronic, "<%%pri%>%timestamp% %syslogtag:R,ERE,2,FIELD:(ironic/.​*/)(.*​)--end% %msg:::sp-if-no-1st-sp%%msg%\n"
36 36
 $template RemoteLogFile, "/var/log/remote/%syslogtag:R,ERE,1,DFLT:([A-Za-z][A-Za-z0-9_./-]*)--end%.log"
37 37
 
38
-:FROMHOST, regex, "^[1-9]" -?RemoteLogFile;RemoteLog
38
+:FROMHOST, regex, "^[1-9]" -?RemoteLogFile;RemoteLogIronic

Loading…
Cancel
Save