Merge "nova-placement: switch auth_uri to keystone versionless endpoint" into stable...

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

diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml
index f0e2f71..b6c4352 100644 (file)
--- a/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@@ -96,11 +96,12 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [HAProxyBase, role_data, config_settings]
-          - tripleo::haproxy::haproxy_daemon: false
-            tripleo::haproxy::haproxy_service_manage: false
+          - tripleo::haproxy::haproxy_service_manage: false
             # NOTE(jaosorior): We disable the CRL since we have no way to restart haproxy
             # when this is updated
             tripleo::haproxy::crl_file: null
+      logging_source: {get_attr: [HAProxyBase, role_data, logging_source]}
+      logging_groups: {get_attr: [HAProxyBase, role_data, logging_groups]}
       step_config: &step_config
         get_attr: [HAProxyBase, role_data, step_config]
       service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
@@ -130,7 +131,7 @@ outputs:
             - null
       kolla_config:
         /var/lib/kolla/config_files/haproxy.json:
-          command: haproxy -f /etc/haproxy/haproxy.cfg
+          command: /usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"