Reviewed: https://review.opendev.org/702066 Committed: https://git.openstack.org/cgit/openstack/puppet-tripleo/commit/?id=7c96510dc4b4c70f2927d2b3c89ba562b588159c Submitter: Zuul Branch: stable/queens
commit 7c96510dc4b4c70f2927d2b3c89ba562b588159c Author: Michele Baldessari <email address hidden> Date: Tue Jan 7 17:36:37 2020 +0100
Allow mysql haproxy stanza do be customized
We introduce a new tripleo::haproxy parameter called mysql_custom_listen_options which can be used to customize mysql listen options in haproxy's config.
Tested as follows: parameter_defaults: ExtraConfig: tripleo::haproxy::haproxy_default_timeout: - 'http-request 10s' - 'queue 2m' - 'connect 10s' - 'client 5m' - 'server 5m' - 'check 10s' tripleo::haproxy::cinder::options: bind-process: 2 tripleo::haproxy::glance_api::options: bind-process: 2 tripleo::haproxy::mysql_custom_listen_options: bind-process: 2
Observed that haproxy's mysql stanza had: listen mysql bind 172.17.1.91:3306 transparent bind-process 2 option tcpka option httpchk
Before this patch this was not the case and the tripleo::haproxy::<mysql>::options just got ignored.
Closes-Bug: #1858775
Change-Id: Ia0ecca5b54c1ca51898035e641665150dbdac9f7 (cherry picked from commit c42c5aa67828c8277d676e609bc828eb1dd1ba37) (cherry picked from commit 64951b5c124b90e97404a7ad5c1439a768afbb2a) (cherry picked from commit 48ff6171b51a70e6800fa87a7aec124ad6110cda)
Reviewed: https:/ /review. opendev. org/702066 /git.openstack. org/cgit/ openstack/ puppet- tripleo/ commit/ ?id=7c96510dc4b 4c70f2927d2b3c8 9ba562b588159c
Committed: https:/
Submitter: Zuul
Branch: stable/queens
commit 7c96510dc4b4c70 f2927d2b3c89ba5 62b588159c
Author: Michele Baldessari <email address hidden>
Date: Tue Jan 7 17:36:37 2020 +0100
Allow mysql haproxy stanza do be customized
We introduce a new tripleo::haproxy parameter called mysql_custom_ listen_ options
which can be used to customize mysql listen options in haproxy's config.
Tested as follows: defaults:
tripleo: :haproxy: :haproxy_ default_ timeout:
tripleo: :haproxy: :cinder: :options:
bind- process: 2
tripleo: :haproxy: :glance_ api::options:
bind- process: 2
tripleo: :haproxy: :mysql_ custom_ listen_ options:
bind- process: 2
parameter_
ExtraConfig:
- 'http-request 10s'
- 'queue 2m'
- 'connect 10s'
- 'client 5m'
- 'server 5m'
- 'check 10s'
Observed that haproxy's mysql stanza had:
listen mysql
bind 172.17.1.91:3306 transparent
bind-process 2
option tcpka
option httpchk
Before this patch this was not the case and the tripleo: :haproxy: :<mysql> ::options just got ignored.
Closes-Bug: #1858775
Change-Id: Ia0ecca5b54c1ca 51898035e641665 150dbdac9f7 77d676e609bc828 eb1dd1ba37) 97404a7ad5c1439 a768afbb2a) 6800fa87a7aec12 4ad6110cda)
(cherry picked from commit c42c5aa67828c82
(cherry picked from commit 64951b5c124b90e
(cherry picked from commit 48ff6171b51a70e