Merge pull request #272 from jsuchome/neutron-ha-tool-timeout

Neutron ha tool timeout
crowbar · Apr 7, 2016 · ef116d5 · ef116d5
2 parents 67c105e + 2c47109
commit ef116d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/chef/cookbooks/neutron/attributes/default.rb b/chef/cookbooks/neutron/attributes/default.rb
@@ -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"

diff --git 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