Merge "[RabbitMQ] Make VRRP script more reliable" into release/proposed/2019.2.0
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 312c7a6..0ad5bec 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -51,7 +51,7 @@
docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
# CVP
- docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.15"
+ docker_image_cvp_sanity_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:2019.2.16"
docker_image_cvp_tempest: "${_param:mcp_docker_registry}/mirantis/cicd/ci-tempest:${_param:openstack_version}"
docker_image_cvp_shaker_checks: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-shaker:2019.2.14"
docker_image_cvp_rally: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-rally:2019.2.5"
@@ -186,7 +186,7 @@
name: cvp-shaker:2019.2.14
- registry: ${_param:mcp_docker_registry}/mirantis/cvp
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/cvp
- name: cvp-sanity-checks:2019.2.15
+ name: cvp-sanity-checks:2019.2.16
- registry: ${_param:mcp_docker_registry}/mirantis/external/xrally
target_registry: ${_param:default_local_mirrror_content:docker_client_registry_target_registry}/mirantis/external/xrally
name: xrally-openstack:0.11.2
diff --git a/haproxy/proxy/listen/openstack/galera/init.yml b/haproxy/proxy/listen/openstack/galera/init.yml
index 1d7285a..67b79b4 100644
--- a/haproxy/proxy/listen/openstack/galera/init.yml
+++ b/haproxy/proxy/listen/openstack/galera/init.yml
@@ -6,6 +6,9 @@
haproxy_params_check: 'check port 9200'
haproxy:
proxy:
+ global:
+ maxconn: 99999
+ maxconn: 99999
timeout:
server: 28810s
client: 28810s
diff --git a/haproxy/proxy/listen/openstack/galera/mysql_neutron_proxy.yml b/haproxy/proxy/listen/openstack/galera/mysql_neutron_proxy.yml
index 6c7b9c2..82b6d50 100644
--- a/haproxy/proxy/listen/openstack/galera/mysql_neutron_proxy.yml
+++ b/haproxy/proxy/listen/openstack/galera/mysql_neutron_proxy.yml
@@ -3,9 +3,6 @@
haproxy_params_check: 'check port 9200'
haproxy:
proxy:
- timeout:
- server: 28810s
- client: 28810s
listen:
mysql_cluster_neutron_conn:
enabled: ${_param:haproxy_neutron_db_proxy_enabled}
diff --git a/haproxy/proxy/listen/openstack/galera/mysql_nova_proxy.yml b/haproxy/proxy/listen/openstack/galera/mysql_nova_proxy.yml
index 8bc138f..7aa7505 100644
--- a/haproxy/proxy/listen/openstack/galera/mysql_nova_proxy.yml
+++ b/haproxy/proxy/listen/openstack/galera/mysql_nova_proxy.yml
@@ -3,9 +3,6 @@
haproxy_params_check: 'check port 9200'
haproxy:
proxy:
- timeout:
- server: 28810s
- client: 28810s
listen:
mysql_cluster_nova_conn:
enabled: ${_param:haproxy_nova_db_proxy_enabled}