openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add possibility to increase Murano agent timeout"

Browse Source
This commit is contained in:
Zuul 2018-06-21 03:27:20 +00:00 committed by Gerrit Code Review
commit 105671009d
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/haproxy/defaults/main.yml
View File

@ -45,6 +45,9 @@ haproxy_defaults_balance: "roundrobin"
haproxy_glance_api_client_timeout: "6h" haproxy_glance_api_client_timeout: "6h"
haproxy_glance_api_server_timeout: "6h" haproxy_glance_api_server_timeout: "6h"
haproxy_outward_rabbitmq_client_timeout: "1h"
haproxy_outward_rabbitmq_server_timeout: "1h"
syslog_server: "{{ api_interface_address }}" syslog_server: "{{ api_interface_address }}"
syslog_haproxy_facility: "local1" syslog_haproxy_facility: "local1"

4
ansible/roles/haproxy/templates/haproxy.cfg.j2
View File

@ -67,8 +67,8 @@ listen outward_rabbitmq_management
listen outward_rabbitmq_external listen outward_rabbitmq_external
mode tcp mode tcp
option tcplog option tcplog
timeout client 3600s timeout client {{ haproxy_outward_rabbitmq_client_timeout }}
timeout server 3600s timeout server {{ haproxy_outward_rabbitmq_server_timeout }}
bind {{ kolla_external_vip_address }}:{{ outward_rabbitmq_port }} bind {{ kolla_external_vip_address }}:{{ outward_rabbitmq_port }}
{% for tcp_option in haproxy_listen_tcp_extra %} {% for tcp_option in haproxy_listen_tcp_extra %}
{{ tcp_option }} {{ tcp_option }}

1
ansible/roles/murano/defaults/main.yml
View File

@ -58,6 +58,7 @@ murano_logging_debug: "{{ openstack_logging_debug }}"
openstack_murano_auth: "{{ openstack_auth }}" openstack_murano_auth: "{{ openstack_auth }}"
murano_agent_timeout: 3600
#################### ####################
# Kolla # Kolla

1
ansible/roles/murano/templates/murano.conf.j2
View File

@ -12,6 +12,7 @@ transport_url = {{ rpc_transport_url }}
[engine] [engine]
engine_workers = {{ openstack_service_workers }} engine_workers = {{ openstack_service_workers }}
agent_timeout = {{ murano_agent_timeout }}
[database] [database]
connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_password }}@{{ murano_database_address }}/{{ murano_database_name }} connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_password }}@{{ murano_database_address }}/{{ murano_database_name }}