diff options
| author | Joshua Harlow <harlowja@gmail.com> | 2014-10-12 10:12:00 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@gmail.com> | 2014-10-12 10:12:00 -0700 |
| commit | 088b3b7eaab6c36ef404978f10c514785651a8fd (patch) | |
| tree | eeffeaf176abfcda75c8b28bd3a8e63acd900f81 | |
| parent | f99d19b95009fea854adbb376518f92c195af917 (diff) | |
| download | vyos-cloud-init-088b3b7eaab6c36ef404978f10c514785651a8fd.tar.gz vyos-cloud-init-088b3b7eaab6c36ef404978f10c514785651a8fd.zip | |
Retain the old behavior for mandatory keys
The keys 'server_url' and 'validation_name' were
previously mandatory, we should retain that behavior
for now.
| -rw-r--r-- | cloudinit/config/cc_chef.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py index 687be69f..1e44ec72 100644 --- a/cloudinit/config/cc_chef.py +++ b/cloudinit/config/cc_chef.py @@ -111,13 +111,13 @@ def get_template_params(iid, chef_cfg, log): # These ones are overwritten to be exact values... params.update({ 'generated_by': util.make_header(), - 'server_url': util.get_cfg_option_str(chef_cfg, 'server_url'), 'node_name': util.get_cfg_option_str(chef_cfg, 'node_name', default=iid), 'environment': util.get_cfg_option_str(chef_cfg, 'environment', default='_default'), - 'validation_name': util.get_cfg_option_str(chef_cfg, - 'validation_name'), + # These two are mandatory... + 'server_url': chef_cfg['server_url'], + 'validation_name': chef_cfg['validation_name'], }) return params |