![Ronelle Landy](/assets/img/avatar_default.png)
hieradata-overrides-t-h-t-undercloud.yaml had the OVB undercloud networks hardcoded. These values will not work for baremetal systems. This review parameterizes the network values to allow baremetal envs to use suitable networks. Depends-On: https://review.openstack.org/#/c/643140 Change-Id: I001102bfa5a2739655be81808655bc751b25cf42
94 lines
4.4 KiB
Django/Jinja
94 lines
4.4 KiB
Django/Jinja
parameter_defaults:
|
|
UndercloudExtraConfig:
|
|
# Ironic defaults to using `qemu:///system`. When running libvirtd
|
|
# unprivileged we need to use `qemu:///session`. This allows us to pass
|
|
# the value of libvirt_uri into /etc/ironic/ironic.conf.
|
|
ironic::drivers::ssh::libvirt_uri: '{{libvirt_uri}}'
|
|
|
|
{% if ctlplane_masquerade|default(false) %}
|
|
# Override masquerading, OVB need's to masquerade the External (10.0.0.0/24) net as well.
|
|
tripleo::masquerade_networks::masquerade_networks: {% if overcloud_ipv6|bool %}{'{{ undercloud_network_cidr }}': ['{{ undercloud_network_cidr }}'], '{{ undercloud_external_network_cidr_ipv4 }}': ['{{ undercloud_external_network_cidr_ipv4}}']}{% else %}{'{{ undercloud_network_cidr }}': ['{{ undercloud_network_cidr }}'], '{{ undercloud_external_network_cidr }}': ['{{ undercloud_external_network_cidr}}']}{% endif -%}
|
|
{% endif %}
|
|
|
|
# The following are configurations for the different workers for the undercloud
|
|
# services.
|
|
{% if undercloud_workers is defined -%}
|
|
undercloud_workers: {{undercloud_workers}}
|
|
{%- endif %}
|
|
|
|
{% if undercloud_glance_workers is defined -%}
|
|
glance::api::workers: {{undercloud_glance_workers}}
|
|
glance::registry::workers: {{undercloud_glance_workers}}
|
|
{% elif undercloud_workers is defined -%}
|
|
glance::api::workers: "%{hiera('undercloud_workers')}"
|
|
glance::registry::workers: "%{hiera('undercloud_workers')}"
|
|
{%- endif %}
|
|
|
|
{% if undercloud_heat_workers is defined -%}
|
|
heat::api::workers: {{undercloud_heat_workers}}
|
|
heat::api_cfn::workers: {{undercloud_heat_workers}}
|
|
heat::engine::num_engine_workers: {{undercloud_heat_workers}}
|
|
{% elif undercloud_workers is defined -%}
|
|
heat::api::workers: "%{hiera('undercloud_workers')}"
|
|
heat::api_cfn::workers: "%{hiera('undercloud_workers')}"
|
|
heat::engine::num_engine_workers: "%{hiera('undercloud_workers')}"
|
|
{%- endif %}
|
|
|
|
{% if undercloud_ironic_workers is defined -%}
|
|
ironic::api::workers: {{undercloud_ironic_workers}}
|
|
ironic::wsgi::apache::workers: {{undercloud_ironic_workers}}
|
|
{% elif undercloud_workers is defined -%}
|
|
ironic::api::workers: "%{hiera('undercloud_workers')}"
|
|
ironic::wsgi::apache::workers: "%{hiera('undercloud_workers')}"
|
|
{%- endif %}
|
|
|
|
{% if undercloud_keystone_workers is defined -%}
|
|
keystone::wsgi::apache::workers: {{undercloud_keystone_workers}}
|
|
{% elif undercloud_workers is defined -%}
|
|
keystone::wsgi::apache::workers: "%{hiera('undercloud_workers')}"
|
|
{%- endif %}
|
|
|
|
{% if undercloud_neutron_workers is defined -%}
|
|
neutron::agents::metadata::metadata_workers: {{undercloud_neutron_workers}}
|
|
neutron::server::api_workers: {{undercloud_neutron_workers}}
|
|
{% elif undercloud_workers is defined -%}
|
|
neutron::agents::metadata::metadata_workers: "%{hiera('undercloud_workers')}"
|
|
neutron::server::api_workers: "%{hiera('undercloud_workers')}"
|
|
{%- endif %}
|
|
|
|
{% if undercloud_nova_workers is defined -%}
|
|
nova::api::metadata_workers: {{undercloud_nova_workers}}
|
|
nova::api::osapi_compute_workers: {{undercloud_nova_workers}}
|
|
nova::conductor::workers: {{undercloud_nova_workers}}
|
|
nova::scheduler::workers: {{undercloud_nova_workers}}
|
|
{% elif undercloud_workers is defined -%}
|
|
nova::api::metadata_workers: "%{hiera('undercloud_workers')}"
|
|
nova::api::osapi_compute_workers: "%{hiera('undercloud_workers')}"
|
|
nova::conductor::workers: "%{hiera('undercloud_workers')}"
|
|
nova::scheduler::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 -%}
|
|
swift::proxy::workers: "%{hiera('undercloud_workers')}"
|
|
{%- endif %}
|
|
|
|
{% if undercloud_heat_convergence is defined -%}
|
|
# The following is configuration for heat convergence feature:
|
|
heat::engine::convergence_engine: {{undercloud_heat_convergence}}
|
|
{%- endif %}
|