Merge "Align novajoin container logging to other services"

docker/services/novajoin.yaml

@@ -162,9 +162,9 @@ outputs:
         config_image: {get_param: DockerNovajoinConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/novajoin_server.json:
-          command: novajoin-server --log-file /dev/stdout --config-file /etc/novajoin/join.conf
+          command: novajoin-server --config-file /etc/novajoin/join.conf
         /var/lib/kolla/config_files/novajoin_notifier.json:
-          command: novajoin-notify --log-file /dev/stdout --config-file /etc/novajoin/join.conf
+          command: novajoin-notify --config-file /etc/novajoin/join.conf
       docker_config:
         step_4:
           novajoin_server:
@@ -181,6 +181,7 @@ outputs:
                   - /var/lib/config-data/novajoin/etc/novajoin/join.conf:/etc/novajoin/join.conf:z
                   - /etc/ipa/:/etc/ipa/:ro
                   - /etc/novajoin/krb5.keytab:/etc/novajoin/krb5.keytab:ro
+                  - /var/log/containers/novajoin:/var/log/novajoin
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
               - KRB5_CONFIG=/etc/novajoin/krb5.conf
@@ -198,6 +199,7 @@ outputs:
                   - /var/lib/config-data/novajoin/etc/novajoin/join.conf:/etc/novajoin/join.conf:Z
                   - /etc/ipa/:/etc/ipa/:ro
                   - /etc/novajoin/krb5.keytab:/etc/novajoin/krb5.keytab:ro
+                  - /var/log/containers/novajoin:/var/log/novajoin
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
               - KRB5_CONFIG=/etc/novajoin/krb5.conf
@@ -210,6 +212,20 @@ outputs:
           set_fact:
             ipa_otp: {get_param: NovajoinIpaOtp}
           no_log: true
+        - name: create persistent directories
+          file:
+            path: "{{ item.path }}"
+            state: directory
+            setype: "{{ item.setype }}"
+          with_items:
+            - { 'path': /var/log/containers/novajoin, 'setype': svirt_sandbox_file_t }
+        - name: novajoin logs readme
+          copy:
+            dest: /var/log/novajoin/readme.txt
+            content: |
+              Log files from novajoin containers can be found under
+              /var/log/containers/novajoin
+          ignore_errors: true
         - name: Enroll to FreeIPA
           command: ipa-client-install -U --password={{ ipa_otp }}
           args:

releasenotes/notes/container-logging-novajoin-90398bce0bc1a7b9.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Novajoin now log's to ``/var/log/container`` in the same way other TripleO
+    container services do. See `Bug: 1796658
+    <https://bugs.launchpad.net/tripleo/+bug/1796658>`_.
+