Replaced ifvarclass with if in templates

Used find and replace in editor, reviewed each instance
to correct any indentation / alignment issues.

Changelog: None
Ticket: CFE-3472
Signed-off-by: Ole Herman Schumacher Elgesem <ole@northern.tech>

Author: olehermanse

controls/update_def.cf.in

@@ -33,11 +33,11 @@ bundle common update_def
 
       "augments_inputs"
         slist => {},
-        ifvarclass => not( isvariable( "def.update_inputs" ) );
+        if => not( isvariable( "def.update_inputs" ) );
 
       "augments_inputs"
         slist => { @(def.update_inputs) },
-        ifvarclass => isvariable( "def.update_inputs" );
+        if => isvariable( "def.update_inputs" );
 
       # Default the input name patterns, if we don't find it defined in def
       # (from the augments_file).
@@ -48,9 +48,9 @@ bundle common update_def
         comment => "Filename patterns to match when updating the policy
                     (see update/update_policy.cf)",
         handle => "common_def_vars_input_name_patterns_policy_default",
-        ifvarclass => and(and(not(isvariable("override_data_acl")),
-                          not(isvariable("input_name_patterns"))),
-                          not(isvariable("def.input_name_patterns"))),
+        if => and(and(not(isvariable("override_data_acl")),
+                  not(isvariable("input_name_patterns"))),
+                  not(isvariable("def.input_name_patterns"))),
         meta => { "defvar" };
 
       # define based on data in def (which comes from augments file), if
@@ -60,7 +60,7 @@ bundle common update_def
         comment => "Filename patterns to match when updating the policy
                     (see update/update_policy.cf)",
         handle => "common_def_vars_input_name_patterns",
-        ifvarclass => and( isvariable("def.input_name_patterns"),
+        if => and( isvariable("def.input_name_patterns"),
                            not(isvariable("input_name_patterns"))),
         meta => { "defvar" };
 

promises.cf.in

@@ -345,14 +345,14 @@ bundle common services_autorun
   reports:
     DEBUG|DEBUG_services_autorun::
       "DEBUG $(this.bundle): Services Autorun Disabled"
-        ifvarclass => "!services_autorun";
+        if => "!services_autorun";
 
       "DEBUG $(this.bundle): Services Autorun Enabled"
-        ifvarclass => "services_autorun";
+        if => "services_autorun";
 
       "DEBUG $(this.bundle): adding input='$(inputs)'"
-        ifvarclass => isvariable("inputs");
+        if => isvariable("inputs");
 
       "DEBUG $(this.bundle): adding input='$(found_inputs)'"
-        ifvarclass => isvariable("found_inputs");
+        if => isvariable("found_inputs");
 }

standalone_self_upgrade.cf.in

@@ -342,7 +342,7 @@ bundle agent cfengine_software_version_packages1
       comment => "Create a backup script for cf-upgrade",
       handle => "cfe_internal_update_bins_files_backup_script",
       create => "true",
-      ifvarclass => "!windows",
+      if => "!windows",
       edit_defaults => u_empty_no_backup,
       edit_line => u_backup_script,
       perms => u_m("0755");
@@ -351,7 +351,7 @@ bundle agent cfengine_software_version_packages1
       comment => "Create an install script for cf-upgrade",
       handle => "cfe_internal_update_bins_files_install_script",
       create => "true",
-      ifvarclass => "!windows",
+      if => "!windows",
       edit_defaults => u_empty_no_backup,
       edit_line => u_install_script,
       perms => u_m("0755");
@@ -363,7 +363,7 @@ bundle agent cfengine_software_version_packages1
       edit_defaults => u_empty_no_backup,
       edit_line => u_admin_file,
       perms => u_m("0644"),
-      ifvarclass => "solarisx86|solaris";
+      if => "solarisx86|solaris";
 
   packages:
     # Only non policy hubs running are allowed to self upgrade