summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-02-13 12:00:05 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-13 12:00:05 +0000
commit9b3c5d5f10e99a4612bf3e05274c8d183da9f2ca (patch)
treef007e9e337d3a0ebfa1c291c59bf0919542ae883
parent76936c6ecd32033562e10589fb44e7d1cb204e79 (diff)
parent00791156cb2b98f7126a466dc28cf89a4a2a9eef (diff)
Merge "FIX access database failed"
-rw-r--r--deploy/adapters/ansible/openstack/templates/nova.conf5
-rw-r--r--deploy/adapters/ansible/roles/database/templates/my.cnf2
2 files changed, 4 insertions, 3 deletions
diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf
index 99071d78..b648b030 100644
--- a/deploy/adapters/ansible/openstack/templates/nova.conf
+++ b/deploy/adapters/ansible/openstack/templates/nova.conf
@@ -39,8 +39,9 @@ notification_driver = nova.openstack.common.notifier.rpc_notifier
notification_driver = ceilometer.compute.nova_notifier
memcached_servers = {{ memcached_servers }}
-{% if ansible_processor_vcpus > 30 %}
-osapi_compute_workers = 30
+{% if ansible_processor_vcpus > 20 %}
+osapi_compute_workers = 20
+metadata_workers = 20
{% endif %}
[database]
diff --git a/deploy/adapters/ansible/roles/database/templates/my.cnf b/deploy/adapters/ansible/roles/database/templates/my.cnf
index f1170ece..1ed9b931 100644
--- a/deploy/adapters/ansible/roles/database/templates/my.cnf
+++ b/deploy/adapters/ansible/roles/database/templates/my.cnf
@@ -29,7 +29,7 @@ tmp-table-size = 32M
max-heap-table-size = 32M
query-cache-type = 0
query-cache-size = 0M
-thread-cache-size = 50
+thread-cache-size = {{ ansible_processor_vcpus * 10 }}
open-files-limit = 65535
table-definition-cache = 4096
table-open-cache = 10240