diff --git a/chef/cookbooks/neutron/attributes/default.rb b/chef/cookbooks/neutron/attributes/default.rb index 0dad73e..4a0c118 100644 --- 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 index cfb422f..be81f25 100644 --- a/chef/cookbooks/neutron/recipes/network_agents_ha.rb +++ b/chef/cookbooks/neutron/recipes/network_agents_ha.rb @@ -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) }