Alex has proposed merging ~scahartner/cloud-init:Fix-1912424 into cloud-init:master.
Commit message: Fix for : https://bugs.launchpad.net/cloud-init/+bug/1912424 Requested reviews: cloud-init Commiters (cloud-init-dev) For more details, see: https://code.launchpad.net/~scahartner/cloud-init/+git/cloud-init/+merge/396543 Fix for : https://bugs.launchpad.net/cloud-init/+bug/1912424 -- Your team cloud-init Commiters is requested to review the proposed merge of ~scahartner/cloud-init:Fix-1912424 into cloud-init:master.
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py index aaf7136..42a2993 100644 --- a/cloudinit/config/cc_chef.py +++ b/cloudinit/config/cc_chef.py @@ -60,6 +60,7 @@ CHEF_RB_TPL_DEFAULTS = { 'pid_file': '/var/run/chef/client.pid', 'show_time': True, 'encrypted_data_bag_secret': None, + 'chef_license': None, } CHEF_RB_TPL_BOOL_KEYS = frozenset(['show_time']) CHEF_RB_TPL_PATH_KEYS = frozenset([ @@ -70,7 +71,6 @@ CHEF_RB_TPL_PATH_KEYS = frozenset([ 'json_attribs', 'pid_file', 'encrypted_data_bag_secret', - 'chef_license', ]) CHEF_RB_TPL_KEYS = list(CHEF_RB_TPL_DEFAULTS.keys()) CHEF_RB_TPL_KEYS.extend(CHEF_RB_TPL_BOOL_KEYS)
_______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp