Merge pull request #472 from steveb/novarlogironic

Clean up usage of /var/log/ironic
openstack-k8s-operators · Sep 17, 2024 · 13e2efa · 13e2efa
2 parents 4c5724b + 0a26cab
commit 13e2efa
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 42 deletions.
diff --git a/pkg/ironic/volumes.go b/pkg/ironic/volumes.go
@@ -106,7 +106,7 @@ func GetDBSyncVolumeMounts() []corev1.VolumeMount {
 
 	volumeMounts := []corev1.VolumeMount{
 		{
-			Name:      "config-data-merged",
+			Name:      "config-data",
 			MountPath: "/var/lib/kolla/config_files/config.json",
 			SubPath:   "db-sync-config.json",
 			ReadOnly:  true,

diff --git a/pkg/ironicapi/volumes.go b/pkg/ironicapi/volumes.go
@@ -57,11 +57,12 @@ func GetInitVolumeMounts() []corev1.VolumeMount {
 func GetVolumeMounts() []corev1.VolumeMount {
 	volumeMounts := []corev1.VolumeMount{
 		{
-			Name:      "config-data-merged",
+			Name:      "config-data",
 			MountPath: "/var/lib/kolla/config_files/config.json",
 			SubPath:   "ironic-api-config.json",
 			ReadOnly:  true,
 		},
+		GetLogVolumeMount(),
 	}
 
 	return append(ironic.GetVolumeMounts(), volumeMounts...)

diff --git a/pkg/ironicconductor/volumes.go b/pkg/ironicconductor/volumes.go
@@ -49,7 +49,7 @@ func GetInitVolumeMounts() []corev1.VolumeMount {
 func GetVolumeMounts(serviceName string) []corev1.VolumeMount {
 	volumeMounts := []corev1.VolumeMount{
 		{
-			Name:      "config-data-merged",
+			Name:      "config-data",
 			MountPath: "/var/lib/kolla/config_files/config.json",
 			SubPath:   serviceName + "-config.json",
 			ReadOnly:  true,

diff --git a/pkg/ironicneutronagent/volumes.go b/pkg/ironicneutronagent/volumes.go
@@ -90,7 +90,7 @@ func GetVolumeMounts() []corev1.VolumeMount {
 			ReadOnly:  false,
 		},
 		{
-			Name:      "config-data-merged",
+			Name:      "config-data",
 			MountPath: "/var/lib/kolla/config_files/config.json",
 			SubPath:   "ironic-neutron-agent-config.json",
 			ReadOnly:  true,

diff --git a/templates/ironic/config/db-sync-config.json b/templates/ironic/config/db-sync-config.json
@@ -19,12 +19,5 @@
             "owner": "ironic",
             "perm": "0644"
         }
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/ironic",
-            "owner": "ironic:ironic",
-            "recurse": true
-        }
     ]
 }
diff --git a/templates/ironicapi/config/ironic-api-httpd.conf b/templates/ironicapi/config/ironic-api-httpd.conf
@@ -18,6 +18,8 @@ Include conf.d/*.conf
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
 
+ErrorLog /dev/stdout
+ServerSignature Off
 SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
 CustomLog /dev/stdout combined env=!forwarded
 CustomLog /dev/stdout proxy env=forwarded
@@ -37,13 +39,6 @@ CustomLog /dev/stdout proxy env=forwarded
     Require all granted
   </Directory>
 
-  ## Logging
-  ErrorLog /dev/stdout
-  ServerSignature Off
-  SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
-  CustomLog /dev/stdout combined env=!forwarded
-  CustomLog /dev/stdout proxy env=forwarded
-
 {{- if $vhost.TLS }}
   SetEnvIf X-Forwarded-Proto https HTTPS=1
 

diff --git a/templates/ironicconductor/config/dnsmasq-config.json b/templates/ironicconductor/config/dnsmasq-config.json
@@ -9,11 +9,6 @@
         }
     ],
     "permissions": [
-        {
-            "path": "/var/log/ironic",
-            "owner": "ironic:ironic",
-            "recurse": true
-        },
         {
             "path": "/var/lib/ironic",
             "owner": "ironic:ironic",

diff --git a/templates/ironicconductor/config/httpboot-config.json b/templates/ironicconductor/config/httpboot-config.json
@@ -9,11 +9,6 @@
         }
     ],
     "permissions": [
-        {
-            "path": "/var/log/ironic",
-            "owner": "ironic:ironic",
-            "recurse": true
-        },
         {
             "path": "/var/lib/ironic",
             "owner": "ironic:ironic",

diff --git a/templates/ironicconductor/config/httpboot-httpd.conf b/templates/ironicconductor/config/httpboot-httpd.conf
@@ -18,6 +18,8 @@ Include conf.d/*.conf
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
 
+ErrorLog /dev/stdout
+ServerSignature Off
 SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
 CustomLog /dev/stdout combined env=!forwarded
 CustomLog /dev/stdout proxy env=forwarded
@@ -36,8 +38,4 @@ CustomLog /dev/stdout proxy env=forwarded
     Require all granted
   </Directory>
 
-  ## Logging
-  ErrorLog "/var/log/httpd/httpboot_vhost_error.log"
-  ServerSignature Off
-  CustomLog "/var/log/httpd/httpboot_vhost_access.log" combined
 </VirtualHost>
diff --git a/templates/ironicconductor/config/ironic-conductor-config.json b/templates/ironicconductor/config/ironic-conductor-config.json
@@ -22,7 +22,7 @@
     ],
     "permissions": [
         {
-            "path": "/var/log/ironic",
+            "path": "/var/lib/ironic",
             "owner": "ironic:ironic",
             "recurse": true
         }

diff --git a/templates/ironicinspector/config/httpboot-httpd.conf b/templates/ironicinspector/config/httpboot-httpd.conf
@@ -18,6 +18,8 @@ Include conf.d/*.conf
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
 
+ErrorLog /dev/stdout
+ServerSignature Off
 SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
 CustomLog /dev/stdout combined env=!forwarded
 CustomLog /dev/stdout proxy env=forwarded
@@ -36,8 +38,4 @@ CustomLog /dev/stdout proxy env=forwarded
     Require all granted
   </Directory>
 
-  ## Logging
-  ErrorLog "/var/log/httpd/httpboot_vhost_error.log"
-  ServerSignature Off
-  CustomLog "/var/log/httpd/httpboot_vhost_access.log" combined
 </VirtualHost>
diff --git a/templates/ironicinspector/config/httpd.conf b/templates/ironicinspector/config/httpd.conf
@@ -18,6 +18,8 @@ Include conf.d/*.conf
 LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
 LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
 
+ErrorLog /dev/stdout
+ServerSignature Off
 SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
 CustomLog /dev/stdout combined env=!forwarded
 CustomLog /dev/stdout proxy env=forwarded
@@ -27,11 +29,6 @@ CustomLog /dev/stdout proxy env=forwarded
 <VirtualHost *:5050>
   ServerName {{ $vhost.ServerName }}
 
-  ## Logging
-  ErrorLog /dev/stdout
-  ServerSignature Off
-  CustomLog /dev/stdout combined
-
   ## Request header rules
   ## as per http://httpd.apache.org/docs/2.2/mod/mod_headers.html#requestheader
   RequestHeader set X-Forwarded-Proto "https"