Merge "Use conditionals for neutron and glance worker defaults"
This commit is contained in:
commit
0991ed0dfb
|
@ -119,6 +119,7 @@ parameters:
|
|||
|
||||
conditions:
|
||||
use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
|
||||
glance_workers_unset: {equals : [{get_param: GlanceWorkers}, '']}
|
||||
|
||||
resources:
|
||||
|
||||
|
@ -160,7 +161,6 @@ outputs:
|
|||
glance::api::authtoken::password: {get_param: GlancePassword}
|
||||
glance::api::enable_proxy_headers_parsing: true
|
||||
glance::api::debug: {get_param: Debug}
|
||||
glance::api::workers: {get_param: GlanceWorkers}
|
||||
glance::policy::policies: {get_param: GlanceApiPolicies}
|
||||
tripleo.glance_api.firewall_rules:
|
||||
'112 glance_api':
|
||||
|
@ -210,6 +210,11 @@ outputs:
|
|||
tripleo::profile::base::glance::api::glance_nfs_enabled: {get_param: GlanceNfsEnabled}
|
||||
tripleo::glance::nfs_mount::share: {get_param: GlanceNfsShare}
|
||||
tripleo::glance::nfs_mount::options: {get_param: GlanceNfsOptions}
|
||||
-
|
||||
if:
|
||||
- glance_workers_unset
|
||||
- {}
|
||||
- glance::api::workers: {get_param: GlanceWorkers}
|
||||
service_config_settings:
|
||||
keystone:
|
||||
glance::keystone::auth::public_url: {get_param: [EndpointMap, GlancePublic, uri]}
|
||||
|
|
|
@ -21,13 +21,13 @@ parameters:
|
|||
NeutronWorkers:
|
||||
default: ''
|
||||
description: |
|
||||
Sets the number of API and RPC workers for the Neutron service. The
|
||||
default value results in the configuration being left unset and a
|
||||
system-dependent default will be chosen (usually the number of
|
||||
processors). Please note that this can result in a large number of
|
||||
processes and memory consumption on systems with a large core count. On
|
||||
such systems it is recommended that a non-default value be selected that
|
||||
matches the load requirements.
|
||||
Sets the number of API and RPC workers for the Neutron service.
|
||||
The default value results in the configuration being left unset
|
||||
and a system-dependent default will be chosen (usually the number
|
||||
of processors). Please note that this can result in a large number
|
||||
of processes and memory consumption on systems with a large core
|
||||
count. On such systems it is recommended that a non-default value
|
||||
be selected that matches the load requirements.
|
||||
type: string
|
||||
NeutronPassword:
|
||||
description: The password for the neutron service and db account, used by neutron agents.
|
||||
|
@ -92,6 +92,7 @@ parameter_groups:
|
|||
|
||||
conditions:
|
||||
use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
|
||||
neutron_workers_unset: {equals : [{get_param: NeutronWorkers}, '']}
|
||||
|
||||
resources:
|
||||
|
||||
|
@ -136,8 +137,6 @@ outputs:
|
|||
neutron::policy::policies: {get_param: NeutronApiPolicies}
|
||||
neutron::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
||||
neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
||||
neutron::server::api_workers: {get_param: NeutronWorkers}
|
||||
neutron::server::rpc_workers: {get_param: NeutronWorkers}
|
||||
neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
|
||||
neutron::server::enable_proxy_headers_parsing: true
|
||||
neutron::keystone::authtoken::password: {get_param: NeutronPassword}
|
||||
|
@ -178,6 +177,12 @@ outputs:
|
|||
- 'localhost'
|
||||
- {get_param: [ServiceNetMap, NeutronApiNetwork]}
|
||||
tripleo::profile::base::neutron::server::l3_ha_override: {get_param: NeutronL3HA}
|
||||
-
|
||||
if:
|
||||
- neutron_workers_unset
|
||||
- {}
|
||||
- neutron::server::api_workers: {get_param: NeutronWorkers}
|
||||
neutron::server::rpc_workers: {get_param: NeutronWorkers}
|
||||
step_config: |
|
||||
include tripleo::profile::base::neutron::server
|
||||
service_config_settings:
|
||||
|
|
Loading…
Reference in New Issue