Raise timeouts for pcs operations

VPN agent resource disable/delete operations can take much time if some Neutron
resources (routers, VPN connections and so on) exist in a cluster. So raising
timeouts to a more reasonable value (600 seconds)

Change-Id: I535ec245220fd58fc986e9bb23eea38e6e4246eb
This commit is contained in:
Sergey Kolekonov 2016-01-11 12:46:14 +03:00
parent d067794780
commit 240fb0af69
3 changed files with 4 additions and 4 deletions

View File

@ -1,5 +1,5 @@
#!/bin/bash
if [ -n "$(which pcs 2>/dev/null)" -a -n "$(pcs resource show p_neutron-vpn-agent 2>/dev/null)" ]; then
pcs resource disable p_neutron-vpn-agent --wait=60
pcs resource disable p_neutron-vpn-agent --wait=600
fi

View File

@ -40,12 +40,12 @@ class vpnaas::ha {
if $primary_controller {
exec {'remove_p_neutron-l3-agent':
command => 'pcs resource delete p_neutron-l3-agent --wait=60',
command => 'pcs resource delete p_neutron-l3-agent --wait=600',
onlyif => 'pcs resource show p_neutron-l3-agent 2>&1 > /dev/null',
path => '/usr/sbin:/usr/bin:/sbin:/bin',
}
exec {'remove_p_neutron-vpn-agent':
command => 'pcs resource delete p_neutron-vpn-agent --wait=60',
command => 'pcs resource delete p_neutron-vpn-agent --wait=600',
onlyif => 'pcs resource show p_neutron-vpn-agent 2>&1 > /dev/null',
path => '/usr/sbin:/usr/bin:/sbin:/bin',
}

View File

@ -19,4 +19,4 @@
type: shell
parameters:
cmd: ./disable_vpn_agent.sh
timeout: 90
timeout: 720