diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-10-13 18:51:19 -0700 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2014-10-13 18:51:19 -0700 |
| commit | 9974012c8640b731a0e91826fc64e1f5ff5d1096 (patch) | |
| tree | e6bb9dc1cb94dfcbb949c8e02d441de4cdb514d6 /cloudinit/config/cc_chef.py | |
| parent | 5088b76198a8844dcf73ab7d2ef26bf9e5caf552 (diff) | |
| download | vyos-cloud-init-9974012c8640b731a0e91826fc64e1f5ff5d1096.tar.gz vyos-cloud-init-9974012c8640b731a0e91826fc64e1f5ff5d1096.zip | |
Use the key contants in the default key => value set
Diffstat (limited to 'cloudinit/config/cc_chef.py')
| -rw-r--r-- | cloudinit/config/cc_chef.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py index 4350a353..f6f07bce 100644 --- a/cloudinit/config/cc_chef.py +++ b/cloudinit/config/cc_chef.py @@ -43,15 +43,17 @@ REQUIRED_CHEF_DIRS = [ OMNIBUS_URL = "https://www.opscode.com/chef/install.sh" OMNIBUS_URL_RETRIES = 5 +CHEF_VALIDATION_PEM_PATH = '/etc/chef/validation.pem' +CHEF_FB_PATH = '/etc/chef/firstboot.json' CHEF_RB_TPL_DEFAULTS = { # These are ruby symbols... 'ssl_verify_mode': ':verify_none', 'log_level': ':info', # These are not symbols... 'log_location': '/var/log/chef/client.log', - 'validation_key': "/etc/chef/validation.pem", + 'validation_key': CHEF_VALIDATION_PEM_PATH, 'client_key': "/etc/chef/client.pem", - 'json_attribs': "/etc/chef/firstboot.json", + 'json_attribs': CHEF_FB_PATH, 'file_cache_path': "/var/cache/chef", 'file_backup_path': "/var/backups/chef", 'pid_file': "/var/run/chef/client.pid", @@ -78,8 +80,6 @@ CHEF_RB_TPL_KEYS.extend([ ]) CHEF_RB_TPL_KEYS = frozenset(CHEF_RB_TPL_KEYS) CHEF_RB_PATH = '/etc/chef/client.rb' -CHEF_VALIDATION_PEM_PATH = '/etc/chef/validation.pem' -CHEF_FB_PATH = '/etc/chef/firstboot.json' CHEF_EXEC_PATH = '/usr/bin/chef-client' CHEF_EXEC_DEF_ARGS = tuple(['-d', '-i', '1800', '-s', '20']) |