Fix logic of running L3 agent checking
Improve check on current L3 agent so manifests are able to detect the running agent Related-bug: #1470461 Change-Id: Ie0c6136a0395a69f9ba2af77601f96d17f4509d6
This commit is contained in:
parent
acffc1e6cd
commit
e9bfaa3141
|
@ -14,6 +14,6 @@
|
|||
|
||||
Facter.add('is_vpn_enabled') do
|
||||
setcode do
|
||||
Facter::Util::Resolution.exec("pcs resource | grep p_neutron-vpn-agent | awk '{print $3}'")
|
||||
Facter::Util::Resolution.exec("pcs status xml | grep ocf-neutron-vpn-agent | egrep -o Started -m 1")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -18,7 +18,7 @@ class fwaas::params {
|
|||
|
||||
$fuel_settings = parseyaml($astute_settings_yaml)
|
||||
$ha = $fuel_settings['deployment_mode'] ? { 'ha_compact'=>true, default=>false }
|
||||
$vpn_enabled = $::is_vpn_enabled ? { 'clone_p_neutron-vpn-agent'=>true, default=>false }
|
||||
$vpn_enabled = $::is_vpn_enabled ? { 'Started'=>true, default=>false }
|
||||
|
||||
$server_service = 'neutron-server'
|
||||
|
||||
|
|
Loading…
Reference in New Issue