Merge "Fix logic of running L3 agent checking"

This commit is contained in:
Jenkins 2015-07-01 19:26:41 +00:00 committed by Gerrit Code Review
commit 0bd1ef153a
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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'