Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #10711: Improve generated inventory checks when inventory is missing #1148

Merged
merged 1 commit into from May 29, 2017
Merged

Fixes #10711: Improve generated inventory checks when inventory is missing #1148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions techniques/system/inventory/1.0/fusionAgent.st
View file
Open in desktop
Expand Up @@ -618,7 +618,8 @@ bundle agent addInformationsToInventory
bundle agent checkInventoryFile
{
vars:
"inventory_file" slist => findfiles("${g.rudder_var_tmp}/inventory/*.ocs");
"inventory_file" slist => findfiles("${g.rudder_var_tmp}/inventory/*.ocs");
"inventory_file_count" int => length("inventory_file");
!windows.has_rudder_perl::
"perl_command" string => "/opt/rudder/bin/perl -I /opt/rudder/lib/perl5";
!windows.!has_rudder_perl::
Expand All @@ -627,7 +628,8 @@ bundle agent checkInventoryFile
"perl_command" string => "C:\Program Files\FusionInventory-Agent\perl\bin\perl.exe";

classes:
"inventory_file_exist" expression => filesexist("@{inventory_file}");
# To check if inventory file is there, we need to count the file (filexists is not enough if inventory_file is an empty list))
"inventory_file_exist" expression => isgreaterthan("${inventory_file_count}", "0");
"has_rudder_perl" expression => fileexists("/opt/rudder/bin/perl");
pass1.inventory_file_exist.!windows::
"inventory_valid" expression => returnszero("${perl_command} ${this.promise_dirname}/test-inventory.pl ${inventory_file}", "noshell"),
Expand Down