Disable l3-agent resource using exec
Due constraint problem with new pacemaker v2 Change-Id: I5ec5b21b86218b300f520ade1e860a3d57393bbc
This commit is contained in:
parent
c01a842355
commit
988b74f011
|
@ -1,5 +1,5 @@
|
|||
#This class contains common changes both for HA and simple deployment mode.
|
||||
#It enables VPN tab in Horizon and setups Neutron server.
|
||||
#It enables VPN in Horizon and Neutron server.
|
||||
|
||||
class vpnaas::common {
|
||||
|
||||
|
|
|
@ -37,16 +37,11 @@ class vpnaas::ha {
|
|||
enabled => false,
|
||||
}
|
||||
|
||||
service {'p_neutron-l3-agent':
|
||||
enable => true,
|
||||
ensure => stopped,
|
||||
hasstatus => true,
|
||||
hasrestart => true,
|
||||
provider => 'pacemaker',
|
||||
exec {'remove_p_neutron-l3-agent':
|
||||
command => "pcs resource disable p_neutron-l3-agent --wait=30",
|
||||
path => '/usr/sbin:/usr/bin:/sbin:/bin',
|
||||
}
|
||||
|
||||
Service['p_neutron-l3-agent'] -> Class['vpnaas::agent']
|
||||
|
||||
$csr_metadata = undef
|
||||
$csr_complex_type = 'clone'
|
||||
$csr_ms_metadata = { 'interleave' => 'true' }
|
||||
|
@ -90,9 +85,10 @@ class vpnaas::ha {
|
|||
command => "pcs resource show p_neutron-vpn-agent > /dev/null 2>&1",
|
||||
path => '/usr/sbin:/usr/bin:/sbin:/bin',
|
||||
}
|
||||
Exec['waiting-for-vpn-agent'] -> Cluster::Corosync::Cs_service["vpn"]
|
||||
Exec['waiting-for-vpn-agent'] -> Cluster::Corosync::Cs_service["vpn"]
|
||||
}
|
||||
|
||||
Exec['remove_p_neutron-l3-agent'] -> Cluster::Corosync::Cs_service["vpn"]
|
||||
File['q-agent-cleanup.py'] -> Cluster::Corosync::Cs_service["vpn"]
|
||||
File["${vpnaas::params::vpn_agent_ocf_file}"] -> Cluster::Corosync::Cs_service["vpn"] ->
|
||||
Cluster::Corosync::Cs_with_service['vpn-and-ovs'] -> Class['vpnaas::common']
|
||||
|
|
Loading…
Reference in New Issue