summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-03-27 10:18:37 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-27 10:18:37 +0000
commitc79c539411bec3da60bf60cb41906c63c1184ce5 (patch)
tree6ff83b7632aa4dc862d58f1ce79e9587979067ce
parent4ef20a75da0cad69c05c8f4a91efb7e344f620a9 (diff)
parentaa0b6db18b0d977c1564ff018c45ac71bbd9c8d4 (diff)
Merge "FIX access database failed"
-rw-r--r--deploy/adapters/ansible/openstack/templates/nova.conf5
-rw-r--r--deploy/adapters/ansible/roles/cinder-controller/templates/cinder.conf5
-rw-r--r--deploy/adapters/ansible/roles/heat/templates/heat.j25
-rwxr-xr-xdeploy/compass_conf/templates/ansible_installer/openstack_newton/vars/HA-ansible-multinodes.tmpl2
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 ac82a981..bc349fce 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
@@ -199,6 +199,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