Merge "Enable keystone db sync to log to stdout"

docker/services/keystone.yaml

@@ -150,8 +150,10 @@ outputs:
                       - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
                       - ''
             environment:
-              - KOLLA_BOOTSTRAP=True
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              list_concat:
+              - - KOLLA_BOOTSTRAP=True
+                - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              - {get_attr: [KeystoneLogging, environment]}
             command: ['/usr/bin/bootstrap_host_exec', 'keystone', '/usr/local/bin/kolla_start']
           keystone:
             start_order: 2

docker/services/logging/files/keystone.yaml

@@ -27,6 +27,9 @@ outputs:
           user: root
           command: ['/bin/bash', '-c', 'chown -R keystone:keystone /var/log/keystone']
           volumes: *keystone_volumes
+  environment:
+    description: Extra environment variables needed for the service to log to files.
+    value: null
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value:

docker/services/logging/stdout/keystone.yaml

@@ -51,6 +51,10 @@ outputs:
           command: ['/bin/bash', '-c', 'mkdir -p /var/log/keystone && rm -f /var/log/keystone/keystone.log && mkfifo /var/log/keystone/keystone.log && while true; do cat /var/log/keystone/keystone.log; done']
           volumes:
             - KeystoneLogs:/var/log/
+  environment:
+    description: Extra environment variables needed for the service to log to stdout.
+    value:
+      - EXTRA_KEYSTONE_MANAGE_ARGS=--log-dir= --log-file=
   volumes:
     description: The volumes needed to log to stdout or a sidecar container.
     value: