Send container logs to stdout

openstack-k8s-operators · Nov 8, 2023 · a8e9334 · a8e9334
1 parent 8d59a90
commit a8e9334
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 45 deletions.
diff --git a/templates/octavia/config/db-sync-config.json b/templates/octavia/config/db-sync-config.json
@@ -9,11 +9,6 @@
         }
     ],
     "permissions": [
-        {
-            "path": "/var/log/octavia",
-            "owner": "octavia:octavia",
-            "recurse": true
-        },
         {
             "path": "/run/octavia",
             "owner": "octavia:octavia",

diff --git a/templates/octavia/config/octavia.conf b/templates/octavia/config/octavia.conf
@@ -1,8 +1,6 @@
 [DEFAULT]
 debug=True
 rpc_response_timeout=60
-log_file=/var/log/octavia/octavia.log
-log_dir=/var/log/octavia
 [api_settings]
 bind_host=192.168.1.147
 bind_port=9876

diff --git a/templates/octaviaamphoracontroller/config/octavia-healthmanager-config.json b/templates/octaviaamphoracontroller/config/octavia-healthmanager-config.json
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/healthmanager.log",
+    "command": "/usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf",
     "config_files": [
         {
             "source": "/var/lib/config-data/merged/octavia.conf",
@@ -13,12 +13,5 @@
             "owner": "octavia",
             "perm": "0600"
         }
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/octavia",
-            "owner": "octavia:octavia",
-            "recurse": true
-        }
     ]
 }
diff --git a/templates/octaviaamphoracontroller/config/octavia-housekeeping-config.json b/templates/octaviaamphoracontroller/config/octavia-housekeeping-config.json
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log",
+    "command": "/usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf",
     "config_files": [
         {
             "source": "/var/lib/config-data/merged/octavia.conf",
@@ -13,12 +13,5 @@
             "owner": "octavia",
             "perm": "0600"
         }
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/octavia",
-            "owner": "octavia:octavia",
-            "recurse": true
-        }
     ]
 }
diff --git a/templates/octaviaamphoracontroller/config/octavia-worker-config.json b/templates/octaviaamphoracontroller/config/octavia-worker-config.json
@@ -1,5 +1,5 @@
 {
-    "command": "/usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/worker.log",
+    "command": "/usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf",
     "config_files": [
         {
             "source": "/var/lib/config-data/merged/octavia.conf",
@@ -13,12 +13,5 @@
             "owner": "octavia",
             "perm": "0600"
         }
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/octavia",
-            "owner": "octavia:octavia",
-            "recurse": true
-        }
     ]
 }
diff --git a/templates/octaviaamphoracontroller/config/octavia.conf b/templates/octaviaamphoracontroller/config/octavia.conf
@@ -1,8 +1,6 @@
 [DEFAULT]
 debug=True
 rpc_response_timeout=60
-log_file=/var/log/octavia/{{ .ServiceRoleName }}.log
-log_dir=/var/log/octavia
 [api_settings]
 [database]
 [health_manager]

diff --git a/templates/octaviaapi/config/octavia-api-config.json b/templates/octaviaapi/config/octavia-api-config.json
@@ -21,11 +21,6 @@
         }
     ],
     "permissions": [
-        {
-            "path": "/var/log/octavia",
-            "owner": "octavia:octavia",
-            "recurse": true
-        },
         {
             "path": "/run/octavia",
             "owner": "octavia:octavia",

diff --git a/templates/octaviaapi/config/octavia-driver-agent-config.json b/templates/octaviaapi/config/octavia-driver-agent-config.json
@@ -15,11 +15,6 @@
         }
     ],
     "permissions": [
-        {
-            "path": "/var/log/octavia",
-            "owner": "octavia:octavia",
-            "recurse": true
-        },
         {
             "path": "/run/octavia",
             "owner": "octavia:octavia",

diff --git a/templates/octaviaapi/config/octavia.conf b/templates/octaviaapi/config/octavia.conf
@@ -1,8 +1,6 @@
 [DEFAULT]
 debug=True
 rpc_response_timeout=60
-log_file=/var/log/octavia/octavia.log
-log_dir=/var/log/octavia
 [api_settings]
 bind_host=192.168.1.147
 bind_port=9876