Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cfbs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Masterfiles",
"name": "masterfiles",
"description": "Official CFEngine Masterfiles Policy Framework (MPF)",
"type": "module",
"provides": {
Expand Down
4 changes: 2 additions & 2 deletions cfe_internal/enterprise/CFE_hub_specific.cf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cfe_internal/enterprise/federation/federation.cf
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
23 changes: 10 additions & 13 deletions cfe_internal/enterprise/ha/ha_info.json
Original file line number Diff line number Diff line change
@@ -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
}
}

2 changes: 1 addition & 1 deletion cfe_internal/recommendations.cf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
bundle agent MPF_class_recommendations
bundle agent mpf_class_recommendations
{
meta:
(policy_server|am_policy_hub).enterprise_edition::
Expand Down
2 changes: 1 addition & 1 deletion inventory/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions inventory/any.cf
Original file line number Diff line number Diff line change
Expand Up @@ -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::
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/lib/files/append_user_field.cf
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ bundle agent check

"fail"
usebundle => dcs_fail( $(this.promise_filename) ),
ifvarclass => "_fail";
if => "_fail";

pass::
"pass"
Expand Down
Loading