From 550d8f573a6bb87514d351d3ac918e84fdc0b312 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Thu, 24 Mar 2016 10:05:50 +0000 Subject: [PATCH 1/2] increase neutron-ha-tool start timeout to 120s (bsc#965886) https://github.com/SUSE-Cloud/cookbook-openstack-network/pull/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) --- chef/cookbooks/neutron/attributes/default.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/chef/cookbooks/neutron/attributes/default.rb b/chef/cookbooks/neutron/attributes/default.rb index 0dad73e..fecc216 100644 --- a/chef/cookbooks/neutron/attributes/default.rb +++ b/chef/cookbooks/neutron/attributes/default.rb @@ -149,6 +149,7 @@ 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][:network][:op][:start][:interval] = "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" From 2c47109442cf8300971b2abd3e38664c5bc739a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Fri, 1 Apr 2016 09:22:12 +0200 Subject: [PATCH 2/2] Set neutron-ha-tool start timeout to 120s (bsc#965886) Set the start timeout only for neutron-ha-tool resource, not for neutron agent services. This fixes change introduced by commit 55504e2e8ccfb23abb8a6b5b31e4ff7ef99e911b, where the 120s value was incorrectly set as "start interval" instead of "start timeout". (cherry picked from commit ec264aa9b22dc919bb6d588e2dce13074f1c656b) --- chef/cookbooks/neutron/attributes/default.rb | 3 ++- chef/cookbooks/neutron/recipes/network_agents_ha.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/chef/cookbooks/neutron/attributes/default.rb b/chef/cookbooks/neutron/attributes/default.rb index fecc216..4a0c118 100644 --- a/chef/cookbooks/neutron/attributes/default.rb +++ b/chef/cookbooks/neutron/attributes/default.rb @@ -149,7 +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][:network][:op][:start][:interval] = "120s" +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" diff --git a/chef/cookbooks/neutron/recipes/network_agents_ha.rb b/chef/cookbooks/neutron/recipes/network_agents_ha.rb index cfb422f..4cdfb2b 100644 --- a/chef/cookbooks/neutron/recipes/network_agents_ha.rb +++ b/chef/cookbooks/neutron/recipes/network_agents_ha.rb @@ -149,7 +149,7 @@ "os_username" => keystone_settings["admin_user"], "os_insecure" => keystone_settings["insecure"] || node[:neutron][:ssl][:insecure] }) - op node[:neutron][:ha][:network][:op] + op node[:neutron][:ha][:neutron_ha_tool][:op] action [ :create, :start ] only_if { use_l3_agent && CrowbarPacemakerHelper.is_cluster_founder?(node) } end