Merge "Move keystone init log container to files logging template"

docker/services/keystone.yaml

@@ -124,16 +124,7 @@ outputs:
       docker_config:
         # Kolla_bootstrap/db sync runs before permissions set by kolla_config
         step_2:
-          map_merge:
-          -
-            keystone_init_log:
-              start_order: 1
-              image: {get_param: DockerKeystoneImage}
-              user: root
-              command: ['/bin/bash', '-c', 'chown -R keystone:keystone /var/log/keystone']
-              volumes:
-                get_attr: [KeystoneLogging, volumes]
-          - get_attr: [KeystoneLogging, docker_config, step_2]
+          get_attr: [KeystoneLogging, docker_config, step_2]
         step_3:
           keystone_db_sync:
             image: &keystone_image {get_param: DockerKeystoneImage}

docker/services/logging/files/keystone.yaml

@@ -12,14 +12,21 @@ outputs:
   config_settings:
     description: Extra hieradata needed to log to files in the host.
     value: null
-  docker_config:
-    description: Extra containers needed for logging to files in the host.
-    value: {}
   volumes:
     description: The volumes needed to log to files in the host.
-    value:
+    value: &keystone_volumes
       - /var/log/containers/keystone:/var/log/keystone
       - /var/log/containers/httpd/keystone:/var/log/httpd
+  docker_config:
+    description: Extra containers needed for logging to files in the host.
+    value:
+      step_2:
+        keystone_init_log:
+          start_order: 1
+          image: {get_param: DockerKeystoneImage}
+          user: root
+          command: ['/bin/bash', '-c', 'chown -R keystone:keystone /var/log/keystone']
+          volumes: *keystone_volumes
   host_prep_tasks:
     description: Extra ansible tasks needed for logging to files in the host.
     value: