diff options
| author |   liyuenan <liyuenan@huawei.com> | 2017-03-09 19:21:25 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2017-03-09 19:25:26 +0800 |
| commit | aa0b6db18b0d977c1564ff018c45ac71bbd9c8d4 (patch) | |
| tree | 2bc08aed1dc074ef2fb0498eb02f02f26e26b133 | |
| parent | 4ba62d9db32b1624a8bb0cd1428fc8dd0ec37da7 (diff) | |
FIX access database failed
JIRA: COMPASS-521
Use a hard value to set number of workers for Openstack API
service. This way only fix E9000 failed temporarily. Database need
to update in a late patch.
Change-Id: Ie03f6a758e1e458567054470962b5be4f6ee630e
Signed-off-by: liyuenan <liyuenan@huawei.com>
4 files changed, 2 insertions, 15 deletions
diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf index 3cd2c03b..eb7ec053 100644 --- a/deploy/adapters/ansible/openstack/templates/nova.conf +++ b/deploy/adapters/ansible/openstack/templates/nova.conf @@ -3,11 +3,6 @@ {% set _ = memcached_servers.append('%s:11211'% host) %} {% endfor %} {% set memcached_servers = memcached_servers|join(',') %} -{% if ansible_processor_vcpus > 10 %} -{% set api_workers = ansible_processor_vcpus // 10 %} -{% else %} -{% set api_workers = 1 %} -{% endif %} [DEFAULT] dhcpbridge_flagfile=/etc/nova/nova.conf diff --git a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf index 8b035653..4ad2da2e 100644 --- a/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf +++ b/deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf @@ -3,11 +3,6 @@ {% set _ = memcached_servers.append('%s:11211'% host) %} {% endfor %} {% set memcached_servers = memcached_servers|join(',') %} -{% if ansible_processor_vcpus > 5 %} -{% set api_workers = ansible_processor_vcpus // 5 %} -{% else %} -{% set api_workers = 1 %} -{% endif %} [DEFAULT] rootwrap_config = /etc/cinder/rootwrap.conf diff --git a/deploy/adapters/ansible/roles/heat/templates/heat.j2 b/deploy/adapters/ansible/roles/heat/templates/heat.j2 index d73bd70b..a8feb940 100644 --- a/deploy/adapters/ansible/roles/heat/templates/heat.j2 +++ b/deploy/adapters/ansible/roles/heat/templates/heat.j2 @@ -3,11 +3,6 @@ {% set _ = memcached_servers.append('%s:11211'% host) %} {% endfor %} {% set memcached_servers = memcached_servers|join(',') %} -{% if ansible_processor_vcpus > 5 %} -{% set api_workers = ansible_processor_vcpus // 5 %} -{% else %} -{% set api_workers = 1 %} -{% endif %} [DEFAULT] heat_metadata_server_url = http://{{ internal_vip.ip }}:8000 diff --git a/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl index b56a0b15..691f62c7 100755 --- a/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl +++ b/deploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl @@ -198,6 +198,8 @@ INSTANCE_TUNNELS_INTERFACE_IP_ADDRESS: "{{ internal_ip }}" build_in_image: http://192.168.121.12:9999/img/cirros-0.3.3-x86_64-disk.img build_in_image_name: cirros-0.3.3-x86_64-disk.img +api_workers: 1 + physical_device: /dev/sdb odl_username: admin |