Merge pull request #3112 from olehermanse/lint

Fixed inconsistencies found by cfengine lint

Author: olehermanse

cfbs.json

@@ -1,5 +1,5 @@
 {
-  "name": "Masterfiles",
+  "name": "masterfiles",
   "description": "Official CFEngine Masterfiles Policy Framework (MPF)",
   "type": "module",
   "provides": {

cfe_internal/enterprise/CFE_hub_specific.cf

@@ -607,7 +607,7 @@ bundle agent log_cfengine_enterprise_license_utilization
 
 }
 
-bundle agent cfe_internal_enterprise_HA_classes
+bundle agent cfe_internal_enterprise_ha_classes
 {
   classes:
       # NOTE The `hub_active` class is a hard class defined by the ha_plugin in
@@ -645,7 +645,7 @@ bundle agent cfe_internal_enterprise_maintenance
 
     enterprise_edition::
       "HA classes"
-        usebundle => "cfe_internal_enterprise_HA_classes",
+        usebundle => "cfe_internal_enterprise_ha_classes",
         comment => "Set the HA-related classes for the maintenance bundles";
 
       "Enterprise Maintenance"

cfe_internal/enterprise/federation/federation.cf

@@ -816,9 +816,9 @@ bundle agent ensure_feeders
         arglist => {
                      "cfdb",
 @if minimum_version(3.24)
-                     "select ensure_feeders($(feeders_arg));"
+                     "select ensure_feeders($(feeders_arg));",
 @else
-                     `"select ensure_feeders($(feeders_arg));"`
+                     `"select ensure_feeders($(feeders_arg));"`,
 @endif
                    },
         classes => psql_wrapper_exit_codes,

cfe_internal/enterprise/ha/ha_info.json

@@ -1,15 +1,12 @@
 {
- "192.168.100.10":
- {
-  "sha": "PLACE KEY HERE",
-  "internal_ip": "192.168.100.10",
-  "is_in_cluster" : true,
- },
- "192.168.100.11":
- {
-  "sha": "PLACE KEY HERE",
-  "internal_ip": "192.168.100.11",
-  "is_in_cluster" : true,
- }
+  "192.168.100.10": {
+    "sha": "PLACE KEY HERE",
+    "internal_ip": "192.168.100.10",
+    "is_in_cluster": true
+  },
+  "192.168.100.11": {
+    "sha": "PLACE KEY HERE",
+    "internal_ip": "192.168.100.11",
+    "is_in_cluster": true
+  }
 }
-

cfe_internal/recommendations.cf

@@ -1,4 +1,4 @@
-bundle agent MPF_class_recommendations
+bundle agent mpf_class_recommendations
 {
   meta:
     (policy_server|am_policy_hub).enterprise_edition::

inventory/README.md

@@ -183,7 +183,7 @@ R: inventory_lsb: OS = Ubuntu, codename = trusty, release = 14.04, flavor = Ubun
 
 * lives in: `any.cf`
 * runs `inventory_control.lldpctl_exec` through a Perl filter
-* provides variables: `cfe_autorun_inventory_LLDP.K` for each `K` returned by the LLDB executable
+* provides variables: `cfe_autorun_inventory_lldp.K` for each `K` returned by the LLDB executable
 
 ## mtab
 

inventory/any.cf

@@ -37,7 +37,7 @@ bundle agent inventory_autorun
 {
   methods:
     !disable_inventory_LLDP::
-      "LLDP" usebundle => cfe_autorun_inventory_LLDP(),
+      "LLDP" usebundle => cfe_autorun_inventory_lldp(),
       handle => "cfe_internal_autorun_inventory_LLDP";
 
     !disable_inventory_package_refresh::
@@ -1066,7 +1066,7 @@ bundle agent cfe_autorun_inventory_dmidecode
       "DEBUG $(this.bundle): Obtained Physical memory (MB) = '$(total_physical_memory_MB)'";
 }
 
-bundle agent cfe_autorun_inventory_LLDP
+bundle agent cfe_autorun_inventory_lldp
 # @brief Do LLDP-based inventory
 #
 # This agent bundle runs lldpctl to discover information.  See

tests/acceptance/lib/files/append_user_field.cf

@@ -48,7 +48,7 @@ bundle agent check
 
       "fail"
         usebundle => dcs_fail( $(this.promise_filename) ),
-        ifvarclass => "_fail";
+        if => "_fail";
 
     pass::
       "pass"