diff options
author | 2017-09-21 03:05:45 +0000 | |
---|---|---|
committer | 2017-09-21 03:05:45 +0000 | |
commit | cf6cee65ee2b0f9db943c448980ee7af74cabab5 (patch) | |
tree | 67fdd45037a1b0012f7cb494aabc20f76eb66d54 /docker/services/pacemaker | |
parent | 1512d3736c1f34e38b1af3f0817b429f1755e0ae (diff) | |
parent | 8a661310d72fe5d6eb72ddd7a957a5b942c8993b (diff) |
Merge "Use haproxy-systemd-wrapper as pid1 in containerized Haproxy" into stable/pike
Diffstat (limited to 'docker/services/pacemaker')
-rw-r--r-- | docker/services/pacemaker/haproxy.yaml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml index a325f286..2cc04e96 100644 --- a/docker/services/pacemaker/haproxy.yaml +++ b/docker/services/pacemaker/haproxy.yaml @@ -78,8 +78,7 @@ outputs: config_settings: map_merge: - get_attr: [HAProxyBase, role_data, config_settings] - - tripleo::haproxy::haproxy_daemon: false - haproxy_docker: true + - haproxy_docker: true tripleo::profile::pacemaker::haproxy_bundle::haproxy_docker_image: &haproxy_image {get_param: DockerHAProxyImage} # the list of directories that contain the certs to bind mount in the countainer # bind-mounting the directories rather than all the cert, key and pem files ensures @@ -120,7 +119,7 @@ outputs: data: *tls_mapping 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: "/" |