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>

diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf
index 3cd2c03..eb7ec05 100644 (file)
--- 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 8b03565..4ad2da2 100644 (file)
--- 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 d73bd70..a8feb94 100644 (file)
--- 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 b56a0b1..691f62c 100755 (executable)
--- 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