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 #10641: Unecessary call to inventory code to check its version during policy validation #1135

Merged
merged 1 commit into from Apr 25, 2017
Merged

Fixes #10641: Unecessary call to inventory code to check its version during policy validation #1135

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
3 changes: 2 additions & 1 deletion techniques/system/inventory/1.0/fusionAgent.st
View file
Open in desktop
Expand Up @@ -199,7 +199,8 @@ bundle agent fusionAgent
!debian.!SuSE::
"xen_tools_package" string => "xen";

!windows::
# guarding execresult to save a lot of time during policy validation
!windows.(force_inventory|inventory_time)::
"fusion_inventory_version" string => execresult("${g.rudder_base}/bin/run-inventory --version | ${paths.path[grep]} '[0-9]\.[0-9]' | ${paths.path[sed]} 's%.*(\([0-9]\+\)\.\([0-9]\+\).*).*%\1\2%'", "useshell");
"inventory_path" string => "${g.rudder_var_tmp}/inventory", policy => "overridable"; # Default value
"inventory_path_edition" string => "${g.rudder_var_tmp}/inventory/.*.ocs", policy => "overridable"; # Default value for editing the inventory files
Expand Down