docker: add logging(source & groups)

[apex-tripleo-heat-templates.git] / docker / services / swift-proxy.yaml

diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index 6ded962..2d745f7 100644 (file)
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -4,17 +4,11 @@ description: >
   OpenStack containerized swift proxy service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerSwiftProxyImage:
     description: image
-    default: 'centos-binary-swift-proxy-server:latest'
     type: string
   DockerSwiftConfigImage:
     description: The container image to use for the swift config_volume
-    default: 'centos-binary-swift-proxy-server:latest'
     type: string
   EndpointMap:
     default: {}
@@ -73,16 +67,15 @@ outputs:
       config_settings: {get_attr: [SwiftProxyBase, role_data, config_settings]}
       step_config: &step_config
         get_attr: [SwiftProxyBase, role_data, step_config]
+      logging_source: {get_attr: [SwiftProxyBase, role_data, logging_source]}
+      logging_groups: {get_attr: [SwiftProxyBase, role_data, logging_groups]}
       service_config_settings: {get_attr: [SwiftProxyBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         config_volume: swift
         puppet_tags: swift_proxy_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ]
+        config_image: {get_param: DockerSwiftConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/swift_proxy.json:
           command: /usr/bin/swift-proxy-server /etc/swift/proxy-server.conf
@@ -106,10 +99,7 @@ outputs:
         step_4:
           map_merge:
             - swift_proxy:
-                image: &swift_proxy_image
-                  list_join:
-                    - '/'
-                    - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
+                image: &swift_proxy_image {get_param: DockerSwiftProxyImage}
                 net: host
                 user: swift
                 restart: always
@@ -123,6 +113,7 @@ outputs:
                       - /srv/node:/srv/node
                       - /dev:/dev
                       - /var/log/containers/swift:/var/log/swift
+                      - /var/log/containers/httpd/swift-proxy:/var/log/httpd
                 environment:
                   - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
             - if:
@@ -150,6 +141,7 @@ outputs:
             state: directory
           with_items:
             - /var/log/containers/swift
+            - /var/log/containers/httpd/swift-proxy
             - /srv/node
       upgrade_tasks:
         - name: Stop and disable swift_proxy service