openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Add Nova max_concurrent_builds, rpc response timeout to undercloud conf"

Browse Source
This commit is contained in:
Zuul 2017-12-15 06:11:51 +00:00 committed by Gerrit Code Review
commit 7bc877db04
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
roles/undercloud-deploy/templates/hieradata-overrides-classic-undercloud.yaml.j2
View File

@ -67,6 +67,21 @@ nova::api::osapi_compute_workers: "%{hiera('undercloud_workers')}"
nova::conductor::workers: "%{hiera('undercloud_workers')}"
{% endif %}
{% if undercloud_nova_max_concurrent_builds is defined %}
nova::compute::ironic::max_concurrent_builds: {{undercloud_nova_max_concurrent_builds}}
{% endif %}
{% if undercloud_nova_rpc_response_timeout is defined %}
nova::rpc_response_timeout: {{undercloud_nova_rpc_response_timeout}}
{% endif %}
{% if undercloud_ironic_rpc_response_timeout is defined %}
ironic::rpc_response_timeout: {{undercloud_ironic_rpc_response_timeout}}
{% endif %}
{% if undercloud_enable_novajoin or enable_tls_everywhere %}
nova::api::vendordata_dynamic_connect_timeout: {{ novajoin_connect_timeout }}
nova::api::vendordata_dynamic_read_timeout: {{ novajoin_read_timeout }}

13
roles/undercloud-deploy/templates/hieradata-overrides-t-h-t-undercloud.yaml.j2
View File

@ -61,6 +61,19 @@ parameter_defaults:
nova::conductor::workers: "%{hiera('undercloud_workers')}"
{% endif %}
{% if undercloud_nova_max_concurrent_builds is defined %}
nova::compute::ironic::max_concurrent_builds: {{undercloud_nova_max_concurrent_builds}}
{% endif %}
{% if undercloud_nova_rpc_response_timeout is defined %}
nova::rpc_response_timeout: {{undercloud_nova_rpc_response_timeout}}
{% endif %}
{% if undercloud_ironic_rpc_response_timeout is defined %}
ironic::rpc_response_timeout: {{undercloud_ironic_rpc_response_timeout}}
{% endif %}
{% if undercloud_swift_workers is defined %}
swift::proxy::workers: {{undercloud_swift_workers}}
{% elif undercloud_workers is defined %}