Merge pull request #1013 from rabi/logging

Remove all /var/log/containers/* mounts

Author: openshift-merge-bot[bot]

plugins/modules/edpm_container_manage.py

@@ -73,6 +73,7 @@
   log_base_path:
     description:
       - Log base path directory
+      - DEPRECATED - Services now log to journald, this parameter is ignored
     type: str
     default: '/var/log/containers/stdouts'
   concurrency:
@@ -129,6 +130,15 @@ def __init__(self, module, results):
         self.log_base_path = args.get('log_base_path')
         self.debug = args.get('debug')
 
+        # Deprecation warning for log_base_path
+        if self.log_base_path and self.log_base_path != '/var/log/containers/stdouts':
+            self.module.deprecate(
+                "The 'log_base_path' parameter is deprecated and ignored. "
+                "Services now log to journald instead of files.",
+                version="0.0.2",
+                collection_name="osp.edpm"
+            )
+
         self.run()
 
         self.module.exit_json(**self.results)
@@ -288,7 +298,6 @@ def manage_container(self, name, config):
             'debug': self.debug,
             'log_driver': 'journald',
             'log_level': 'info',
-            'log_opt': {"path": f"{self.log_base_path}/{name}.log"},
         }
         opts.update(config)
         # do horible things to convert THT format to ansible module format

roles/edpm_container_manage/defaults/main.yml

@@ -28,5 +28,5 @@ edpm_container_manage_config_id: edpm
 edpm_container_manage_config_overrides: {}
 edpm_container_manage_config_patterns: '*.json'
 edpm_container_manage_healthcheck_disabled: false
-edpm_container_manage_log_path: '/var/log/containers/stdouts'
+edpm_container_manage_log_path: '/var/log/containers/stdouts'  # DEPRECATED: ignored, services log to journald
 edpm_container_manage_systemd_teardown: true

roles/edpm_container_manage/meta/argument_specs.yml

@@ -37,6 +37,7 @@ argument_specs:
       edpm_container_manage_log_path:
         type: str
         default: '/var/log/containers/stdouts'
+        description: 'DEPRECATED (will be removed in v0.0.2): Log path for containers - services now log to journald'
       edpm_container_manage_systemd_teardown:
         type: bool
         default: true

roles/edpm_container_manage/tasks/main.yml

@@ -14,15 +14,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-- name: Create container logs path
-  ansible.builtin.file:
-    path: "{{ edpm_container_manage_log_path }}"
-    state: directory
-    owner: root
-    group: root
-    mode: "0755"
-  become: true
-
 - name: Generate containers configs data
   become: true
   block:

roles/edpm_nova/molecule/default/test-data/nova-cell1/02-nova-log.conf

@@ -15,8 +15,6 @@
         - "/etc/tmpfiles.d/"
         - "/var/lib/openstack"
         - "/var/lib/openstack/config/containers"
-        - "/var/log/containers"
-        - "/var/log/containers/stdouts"
         - "/etc/ssh/ssh_known_hosts"
         # extrenal deps
         - "/var/lib/openstack/config/ceph"
@@ -25,7 +23,6 @@
         - "/var/lib/openstack/config/nova"
         - "/var/lib/_nova_secontext"
         - "/var/lib/nova/instances"
-        - "/var/log/containers/nova"
         # NOTE(sean-k-mooney): this directory is normaly created by the edpm_install_cert role
         # in molecule we create it in prepare so lets just assert it exists
         - "{{ edpm_nova_tls_ca_src_dir }}"
@@ -53,7 +50,6 @@
       loop:
         - "Copying /var/lib/kolla/config_files/nova-blank.conf to /etc/nova/nova.conf"
         - "Copying /var/lib/kolla/config_files/01-nova.conf to /etc/nova/nova.conf.d/01-nova.conf"
-        - "Copying /var/lib/kolla/config_files/02-nova-log.conf to /etc/nova/nova.conf.d/02-nova-log.conf"
         - "Copying /var/lib/kolla/config_files/ssh-config to /var/lib/nova/.ssh/config"
         - "Copying /var/lib/kolla/config_files/ssh-privatekey to /var/lib/nova/.ssh/ssh-privatekey"
         - "Copying /var/lib/kolla/config_files/02-nova-host-specific.conf to /etc/nova/nova.conf.d/02-nova-host-specific.conf"

roles/edpm_nova/molecule/default/verify.yml

@@ -103,9 +103,7 @@
   loop:
     - {"path": "/var/lib/nova", "mode": "0755"}
     - {"path": "/var/lib/_nova_secontext", "mode": "0755"}
-    - {"path": "/var/lib/nova/instances", "mode", "0755"}
-    - {"path": "/var/log/containers/nova", "mode": "0750"}
-    - {"path": "/var/log/containers/stdouts"}
+    - {"path": "/var/lib/nova/instances", "mode": "0755"}
     - {"path": "/etc/ceph", "mode": "0750", "owner": "root", "group": "root"}
     - {"path": "/etc/multipath"}
     - {"path": "/etc/iscsi"}

roles/edpm_nova/tasks/configure.yml

@@ -42,11 +42,6 @@
         }
     ],
     "permissions": [
-        {
-            "path": "/var/log/containers/nova",
-            "owner": "nova:nova",
-            "recurse": true
-        },
         {
             "path": "/etc/ceph/*",
             "owner": "nova:nova",

roles/edpm_nova/templates/config.json.j2

@@ -16,7 +16,6 @@
         "/etc/localtime:/etc/localtime:ro",
         "/lib/modules:/lib/modules:ro",
         "/dev:/dev",
-        "/var/log/containers/nova:/var/log/containers/nova",
         "/var/lib/libvirt:/var/lib/libvirt",
         "/run/libvirt:/run/libvirt:shared",
         "/var/lib/nova:/var/lib/nova:shared",

roles/edpm_nova/templates/nova_compute.json.j2

@@ -43,7 +43,6 @@ edpm_swift_storage_volumes:
   - /srv/node:/srv/node
   - /dev:/dev
   - /var/cache/swift:/var/cache/swift
-  - /var/log/containers/swift:/var/log/containers/swift
   - /var/lib/openstack/config/swift:/var/lib/kolla/config_files/src:ro
 
 edpm_swift_account_auditor_volumes: