openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Make neutron dhcp agents per network conditional"

Browse Source
This commit is contained in:
Jenkins 2017-03-06 14:42:57 +00:00 committed by Gerrit Code Review
commit 07f686d085
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
puppet/services/neutron-base.yaml
View File

@ -24,7 +24,7 @@ parameters:
type: number type: number
NeutronDhcpAgentsPerNetwork: NeutronDhcpAgentsPerNetwork:
type: number type: number
default: 3 default: 0
description: The number of neutron dhcp agents to schedule per network description: The number of neutron dhcp agents to schedule per network
NeutronCorePlugin: NeutronCorePlugin:
default: 'ml2' default: 'ml2'
@ -72,24 +72,31 @@ parameters:
via parameter_defaults in the resource registry. via parameter_defaults in the resource registry.
type: json type: json
conditions:
dhcp_agents_zero: {equals : [{get_param: NeutronDhcpAgentsPerNetwork}, 0]}
outputs: outputs:
role_data: role_data:
description: Role data for the Neutron base service. description: Role data for the Neutron base service.
value: value:
service_name: neutron_base service_name: neutron_base
config_settings: config_settings:
neutron::rabbit_password: {get_param: RabbitPassword} map_merge:
neutron::rabbit_user: {get_param: RabbitUserName} - neutron::rabbit_password: {get_param: RabbitPassword}
neutron::rabbit_use_ssl: {get_param: RabbitClientUseSSL} neutron::rabbit_user: {get_param: RabbitUserName}
neutron::rabbit_port: {get_param: RabbitClientPort} neutron::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
neutron::dhcp_agents_per_network: {get_param: NeutronDhcpAgentsPerNetwork} neutron::rabbit_port: {get_param: RabbitClientPort}
neutron::core_plugin: {get_param: NeutronCorePlugin} neutron::core_plugin: {get_param: NeutronCorePlugin}
neutron::service_plugins: {get_param: NeutronServicePlugins} neutron::service_plugins: {get_param: NeutronServicePlugins}
neutron::debug: {get_param: Debug} neutron::debug: {get_param: Debug}
neutron::purge_config: {get_param: EnableConfigPurge} neutron::purge_config: {get_param: EnableConfigPurge}
neutron::allow_overlapping_ips: true neutron::allow_overlapping_ips: true
neutron::rabbit_heartbeat_timeout_threshold: 60 neutron::rabbit_heartbeat_timeout_threshold: 60
neutron::host: '%{::fqdn}' neutron::host: '%{::fqdn}'
neutron::db::database_db_max_retries: -1 neutron::db::database_db_max_retries: -1
neutron::db::database_max_retries: -1 neutron::db::database_max_retries: -1
neutron::global_physnet_mtu: {get_param: NeutronGlobalPhysnetMtu} neutron::global_physnet_mtu: {get_param: NeutronGlobalPhysnetMtu}
- if:
- dhcp_agents_zero
- {}
- tripleo::profile::base::neutron::dhcp_agents_per_network: {get_param: NeutronDhcpAgentsPerNetwork}

8
releasenotes/notes/allow-neutron-dhcp-agents-per-network-calculation-536c70391497256d.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
NeutronDhcpAgents had a default value of 3 that, even though unused in
practice was a bad default value. Changing the default value to a
sentinel value and making the hiera conditional allows deploy-time
logic in puppet to provide a default value based on the number of dhcp
agents being deployed.