Skip to content
This repository has been archived by the owner on Dec 4, 2018. It is now read-only.

Commit

Permalink
increase neutron-ha-tool start timeout to 120s (bsc#965886)
Browse files Browse the repository at this point in the history
SUSE-Cloud/cookbook-openstack-network#1
adds retry logic to neutron-ha-tool so that it will not fail
immediately if there are problems talking to the neutron-server
API.  Therefore we need to give neutron-ha-tool enough time
to have a decent chance of succeeding if the neutron-server
still needs a while to recover after some kind of failover.

https://bugzilla.suse.com/show_bug.cgi?id=965886
(cherry picked from commit 55504e2e8ccfb23abb8a6b5b31e4ff7ef99e911b)
  • Loading branch information
Adam Spiers authored and jsuchome committed Apr 1, 2016
1 parent 07f4354 commit 1c3f7d8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
2 changes: 2 additions & 0 deletions chef/cookbooks/neutron/attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@
default[:neutron][:ha][:network][:linuxbridge_ra] = "lsb:#{node[:neutron][:platform][:lb_agent_name]}"
default[:neutron][:ha][:network][:ha_tool_ra] = "ocf:openstack:neutron-ha-tool"
default[:neutron][:ha][:network][:op][:monitor][:interval] = "10s"
default[:neutron][:ha][:neutron_ha_tool][:op][:monitor][:interval] = "10s"
default[:neutron][:ha][:neutron_ha_tool][:op][:start][:timeout] = "120s"
default[:neutron][:ha][:server][:enabled] = false
default[:neutron][:ha][:server][:server_ra] = "lsb:#{node[:neutron][:platform][:service_name]}"
default[:neutron][:ha][:server][:op][:monitor][:interval] = "10s"
Expand Down
1 change: 1 addition & 0 deletions chef/cookbooks/neutron/recipes/network_agents_ha.rb
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
"os_username" => keystone_settings["admin_user"],
"os_insecure" => keystone_settings["insecure"] || node[:neutron][:ssl][:insecure]
})
op node[:neutron][:ha][:neutron_ha_tool][:op]
op node[:neutron][:ha][:network][:op]
action [ :create, :start ]
only_if { use_l3_agent && CrowbarPacemakerHelper.is_cluster_founder?(node) }
Expand Down

0 comments on commit 1c3f7d8

Please sign in to comment.