Skip to content

Commit

Permalink
Add ability to configure dhcp_agent_notification
Browse files Browse the repository at this point in the history
Add a new dhcp_agent_notification parameter to allow its configuration.

Installation without any DHCP agents should have this option disabled
to avoid these kinds of error messages in Neutron logs:

- No more DHCP agents
- Unable to schedule network XXX: no agents available;
  will retry on subsequent port creation events.
- Will not send event port_create_end for network XXX:
  no agent available.

Conflicts:
  manifests/init.pp
  spec/classes/neutron_init_spec.rb

Change-Id: I42a5a045b777e42e5c99cea16a0fbc6ed145d73b
(cherry picked from commit 0346d48)
  • Loading branch information
mgagne committed Jul 24, 2014
1 parent 6f106f1 commit ebad7a3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
6 changes: 6 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
# This enables redundant DHCP agents for configured networks.
# Defaults to 1
#
# [*dhcp_agent_notification*]
# (optional) Allow sending resource operation notification to DHCP agent.
# Defaults to true
#
# [*allow_bulk*]
# (optional) Enable bulk crud operations
# Defaults to true
Expand Down Expand Up @@ -188,6 +192,7 @@
$mac_generation_retries = 16,
$dhcp_lease_duration = 86400,
$dhcp_agents_per_network = 1,
$dhcp_agent_notification = true,
$allow_bulk = true,
$allow_pagination = false,
$allow_sorting = false,
Expand Down Expand Up @@ -288,6 +293,7 @@
'DEFAULT/mac_generation_retries': value => $mac_generation_retries;
'DEFAULT/dhcp_lease_duration': value => $dhcp_lease_duration;
'DEFAULT/dhcp_agents_per_network': value => $dhcp_agents_per_network;
'DEFAULT/dhcp_agent_notification': value => $dhcp_agent_notification;
'DEFAULT/allow_bulk': value => $allow_bulk;
'DEFAULT/allow_pagination': value => $allow_pagination;
'DEFAULT/allow_sorting': value => $allow_sorting;
Expand Down
1 change: 1 addition & 0 deletions spec/classes/neutron_init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
should contain_neutron_config('DEFAULT/mac_generation_retries').with_value(16)
should contain_neutron_config('DEFAULT/dhcp_lease_duration').with_value(86400)
should contain_neutron_config('DEFAULT/dhcp_agents_per_network').with_value(1)
should contain_neutron_config('DEFAULT/dhcp_agent_notification').with_value(true)
should contain_neutron_config('DEFAULT/allow_bulk').with_value(true)
should contain_neutron_config('DEFAULT/allow_pagination').with_value(false)
should contain_neutron_config('DEFAULT/allow_sorting').with_value(false)
Expand Down

0 comments on commit ebad7a3

Please sign in to comment.