openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use a lower number of the workers"

Browse Source
This commit is contained in:
Jenkins 2016-07-27 17:55:07 +00:00 committed by Gerrit Code Review
commit 3f065d8171
8 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -168,6 +168,8 @@ openstack_logging_debug: "False"
openstack_region_name: "RegionOne" openstack_region_name: "RegionOne"
openstack_service_workers: "{{ [ansible_processor_vcpus, 5]|min }}"
# Optionally allow Kolla to set sysctl values # Optionally allow Kolla to set sysctl values
set_sysctl: "yes" set_sysctl: "yes"

1
ansible/roles/cinder/templates/cinder.conf.j2
View File

@ -9,6 +9,7 @@ use_forwarded_for = true
use_stderr = False use_stderr = False
enable_v1_api=false enable_v1_api=false
osapi_volume_workers = {{ openstack_service_worker }}
volume_name_template = volume-%s volume_name_template = volume-%s
glance_api_servers = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ glance_api_port }} glance_api_servers = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ glance_api_port }}

1
ansible/roles/glance/templates/glance-api.conf.j2
View File

@ -7,6 +7,7 @@ use_forwarded_for = true
bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
bind_port = {{ glance_api_port }} bind_port = {{ glance_api_port }}
workers = {{ openstack_service_workers }}
registry_host = {{ kolla_internal_fqdn }} registry_host = {{ kolla_internal_fqdn }}

1
ansible/roles/glance/templates/glance-registry.conf.j2
View File

@ -6,6 +6,7 @@ log_file = /var/log/kolla/glance/registry.log
bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
bind_port = {{ glance_registry_port }} bind_port = {{ glance_registry_port }}
workers = {{ openstack_service_workers }}
[database] [database]
connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }} connection = mysql+pymysql://{{ glance_database_user }}:{{ glance_database_password }}@{{ glance_database_address }}/{{ glance_database_name }}

2
ansible/roles/heat/templates/heat.conf.j2
View File

@ -14,6 +14,7 @@ stack_user_domain_name = heat_user_domain
rpc_backend = rabbit rpc_backend = rabbit
deferred_auth_method = trusts deferred_auth_method = trusts
trusts_delegated_role = heat_stack_owner trusts_delegated_role = heat_stack_owner
num_engine_workers = {{ openstack_service_workers }}
[oslo_messaging_rabbit] [oslo_messaging_rabbit]
rabbit_userid = {{ rabbitmq_user }} rabbit_userid = {{ rabbitmq_user }}
@ -25,6 +26,7 @@ rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_'
[heat_api] [heat_api]
bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
bind_port = {{ heat_api_port }} bind_port = {{ heat_api_port }}
works = {{ openstack_service_workers }}
{% endif %} {% endif %}
{% if service_name == 'heat-api-cfn' %} {% if service_name == 'heat-api-cfn' %}

3
ansible/roles/murano/templates/murano.conf.j2
View File

@ -8,6 +8,9 @@ bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4'][
bind_port = {{ murano_api_port }} bind_port = {{ murano_api_port }}
{% endif %} {% endif %}
[engine]
workers = {{ openstack_service_workers }}
[database] [database]
connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_password }}@{{ murano_database_address }}/{{ murano_database_name }} connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_password }}@{{ murano_database_address }}/{{ murano_database_name }}
max_retries = -1 max_retries = -1

3
ansible/roles/neutron/templates/neutron.conf.j2
View File

@ -14,6 +14,9 @@ bind_port = {{ neutron_server_port }}
api_paste_config = /usr/share/neutron/api-paste.ini api_paste_config = /usr/share/neutron/api-paste.ini
endpoint_type = internalURL endpoint_type = internalURL
api_workers = {{ openstack_service_workers }}
metadata_works = {{ openstack_service_workers }}
# NOTE(SamYaple): We must specify this value here rather than the metadata conf # NOTE(SamYaple): We must specify this value here rather than the metadata conf
# because it is used by the l3 and dhcp agents. The reason the path has 'kolla' # because it is used by the l3 and dhcp agents. The reason the path has 'kolla'
# in it is because we are sharing this socket in a volume which is it's own dir # in it is because we are sharing this socket in a volume which is it's own dir

5
ansible/roles/nova/templates/nova.conf.j2
View File

@ -14,6 +14,8 @@ secure_proxy_ssl_header = X-Forwarded-Proto
osapi_compute_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} osapi_compute_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
osapi_compute_listen_port = {{ nova_api_port }} osapi_compute_listen_port = {{ nova_api_port }}
osapi_compute_workers = {{ openstack_service_workers }}
metadata_workers = {{ openstack_service_workers }}
metadata_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} metadata_listen = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
metadata_listen_port = {{ nova_metadata_port }} metadata_listen_port = {{ nova_metadata_port }}
@ -60,6 +62,9 @@ compute_monitors=nova.compute.monitors.cpu.virt_driver
{% endif %} {% endif %}
{% endif %} {% endif %}
[conductor]
workers = {{ openstack_service_workers }}
{% if nova_console == 'novnc' %} {% if nova_console == 'novnc' %}
[vnc] [vnc]
novncproxy_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }} novncproxy_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}