diff options
| author |   carey.xu <carey.xuhan@huawei.com> | 2015-12-18 11:48:25 +0800 |
|---|---|---|
| committer | carey xu <carey.xuhan@huawei.com> | 2015-12-24 02:09:18 +0000 |
| commit | 8143bfe61f0f6739818fa92c2646859faea813ec (patch) | |
| tree | da16fc1e3e3b1bd6b67a9e1e9094157a959a925e | |
| parent | 6447ed5fe06bba5b973ba673780235d33c909302 (diff) | |
reduce idle connect timeout both on haproxy and services
JIRA: COMPASS-175
Change-Id: I2b500a6814f39a675d5b7f277bc19688ef33a957
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
| -rw-r--r-- | deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml | 1 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/heat/templates/heat.j2 | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml index 49a34dab..5c047566 100644 --- a/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml +++ b/deploy/adapters/ansible/roles/ceph-deploy/tasks/ceph_install_Debian.yml @@ -9,6 +9,7 @@ - name: install ceph for every nodes includes jumpserver shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy install {{ ceph_cluster_hosts.stdout_lines[0]}} + ignore_errors: true - name: create monitor node in controller group shell: cd {{ ceph_cluster_dir[0] }} && ceph-deploy --overwrite-conf mon create-initial diff --git a/deploy/adapters/ansible/roles/heat/templates/heat.j2 b/deploy/adapters/ansible/roles/heat/templates/heat.j2 index 67beb1ca..aec6b2eb 100644 --- a/deploy/adapters/ansible/roles/heat/templates/heat.j2 +++ b/deploy/adapters/ansible/roles/heat/templates/heat.j2 @@ -9,6 +9,9 @@ log_dir = /var/log/heat [database] connection = mysql://heat:{{ HEAT_DBPASS }}@{{ db_host }}/heat +idle_timeout = 30 +use_db_reconnect = True +pool_timeout = 10 [ec2authtoken] auth_uri = http://{{ internal_vip.ip }}:5000/v2.0 |