From e9bfaa31415afb0558bdf8600f5616a0c3b1021b Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Wed, 1 Jul 2015 16:47:07 +0300 Subject: [PATCH] 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 --- .../puppet/modules/fwaas/lib/facter/is_vpn_enabled.rb | 2 +- deployment_scripts/puppet/modules/fwaas/manifests/params.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment_scripts/puppet/modules/fwaas/lib/facter/is_vpn_enabled.rb b/deployment_scripts/puppet/modules/fwaas/lib/facter/is_vpn_enabled.rb index 4eeb3da..5cc54f1 100644 --- a/deployment_scripts/puppet/modules/fwaas/lib/facter/is_vpn_enabled.rb +++ b/deployment_scripts/puppet/modules/fwaas/lib/facter/is_vpn_enabled.rb @@ -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 diff --git a/deployment_scripts/puppet/modules/fwaas/manifests/params.pp b/deployment_scripts/puppet/modules/fwaas/manifests/params.pp index ce41a2d..66dced8 100644 --- a/deployment_scripts/puppet/modules/fwaas/manifests/params.pp +++ b/deployment_scripts/puppet/modules/fwaas/manifests/params.pp @@ -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'