Actions
Bug #8839
closedArchitecture #7915: Merge initial promises and system techniques
Broken initial promises on 3.3
Pull Request:
Severity:
UX impact:
User visibility:
Effort required:
Priority:
Name check:
Fix check:
Regression:
Description
agent1:/var/rudder/cfengine-community/inputs # diff -cr /opt/rudder/share/initial-promises/ . diff -cr /opt/rudder/share/initial-promises/common/1.0/cron-setup.cf ./common/1.0/cron-setup.cf *** /opt/rudder/share/initial-promises/common/1.0/cron-setup.cf Thu Aug 11 15:52:38 2016 --- ./common/1.0/cron-setup.cf Thu Aug 11 16:19:39 2016 *************** *** 55,61 **** # Cleanup the pre-4.0 crontab "/var/spool/cron/crontabs/root" edit_defaults => noempty_backup, ! edit_line => delete_lines_matching("0,5,10,15,20,25,30,35,40,45,50,55 \* \* \* \* /usr/bin/test -x /opt/rudder/bin/check-rudder-agent && /opt/rudder/bin/check-rudder-agent >/dev/null"), # Add Rudder entry "/var/spool/cron/crontabs/root" --- 55,61 ---- # Cleanup the pre-4.0 crontab "/var/spool/cron/crontabs/root" edit_defaults => noempty_backup, ! edit_line => delete_lines_matching("0,5,10,15,20,25,30,35,40,45,50,55 \* \* \* \* /usr/bin/test -x /opt/rudder/bin/check-rudder-agent && /opt/rudder/bin/check-rudder-agent >/dev/null"); # Add Rudder entry "/var/spool/cron/crontabs/root" diff -cr /opt/rudder/share/initial-promises/promises.cf ./promises.cf *** /opt/rudder/share/initial-promises/promises.cf Thu Aug 11 15:52:38 2016 --- ./promises.cf Thu Aug 11 16:19:23 2016 *************** *** 48,54 **** inputs => { @{va.inputs_list}, ! "rudder-system-directives.cf", }; bundlesequence => { --- 48,54 ---- inputs => { @{va.inputs_list}, ! "common/1.0/rudder-system-directives.cf", }; bundlesequence => { *************** *** 68,76 **** "endExecution" }; - # all other inputs are loaded by body file control in rudder-system-directives.cf and rudder-directives.cf - "inputs_list" slist => { @{ncf_inputs} }; - "common_bs" slist => { "startup", "check_disable_agent", --- 68,73 ---- *************** *** 107,116 **** !policy_server:: # This bundle is duplicated to avoid having empty lists and cfnull in bundlesequence ! "specific_bs" slist => { "check_binaries_freshness" } ! ! # all other inputs are loaded by body file control in rudder_system_directives.cf and rudder_directives.cf ! "inputs_list" slist => { @{ncf_inputs} }; !android.!windows:: "rudder_var" string => "/var/rudder"; --- 104,110 ---- !policy_server:: # This bundle is duplicated to avoid having empty lists and cfnull in bundlesequence ! "specific_bs" slist => { "check_binaries_freshness" }; !android.!windows:: "rudder_var" string => "/var/rudder"; *************** *** 154,159 **** --- 148,156 ---- # Need to remove cf_null from the list "ncf_inputs" slist => filter("${ncf_path}/cf_null", "raw_ncf_inputs", "false", "true", 10000); + + "inputs_list" slist => { @{ncf_inputs} }; + # definition of the machine roles # This node doesn't have any specific role # policy_server and root_server migrated to rudder_roles
Actions