openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use haproxy-systemd-wrapper as pid1 in containerized Haproxy"

This commit is contained in:
Jenkins 2017-09-20 14:15:33 +00:00 committed by Gerrit Code Review
parent 52e1a0c943 91cd44cd72
commit 46d0b18e5c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/services/haproxy.yaml
View File

@ -96,8 +96,7 @@ outputs:
config_settings: config_settings:
map_merge: map_merge:
- get_attr: [HAProxyBase, role_data, config_settings] - 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 # NOTE(jaosorior): We disable the CRL since we have no way to restart haproxy
# when this is updated # when this is updated
tripleo::haproxy::crl_file: null tripleo::haproxy::crl_file: null
@ -130,7 +129,7 @@ outputs:
- null - null
kolla_config: kolla_config:
/var/lib/kolla/config_files/haproxy.json: /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: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"

5
docker/services/pacemaker/haproxy.yaml
View File

@ -78,8 +78,7 @@ outputs:
config_settings: config_settings:
map_merge: map_merge:
- get_attr: [HAProxyBase, role_data, config_settings] - 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} 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 # 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 # bind-mounting the directories rather than all the cert, key and pem files ensures
@ -120,7 +119,7 @@ outputs:
data: *tls_mapping data: *tls_mapping
kolla_config: kolla_config:
/var/lib/kolla/config_files/haproxy.json: /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: config_files:
- source: "/var/lib/kolla/config_files/src/*" - source: "/var/lib/kolla/config_files/src/*"
dest: "/" dest: "/"