diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-04-12 10:38:09 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-04-12 10:38:09 -0400 |
| commit | 7122f7d6fac6eb78922a474facfd9d439d1bf5b6 (patch) | |
| tree | 8e85747aeac22ee78cf63ddd41ceac6d6ba43dca /templates/chef_client.rb.tmpl | |
| parent | 763be4ecccca0c0ccb62466699cc9cd22f79adc7 (diff) | |
| download | vyos-cloud-init-7122f7d6fac6eb78922a474facfd9d439d1bf5b6.tar.gz vyos-cloud-init-7122f7d6fac6eb78922a474facfd9d439d1bf5b6.zip | |
chef: straighten out validation_cert and validation_key
Now, validation_key is always a path to a file, as it is in
chef's client.rb syntax.
validation_cert is always the *content* of that file that should
be written. However, if validation_cert is the string "system",
then we do not write that value, but rather assume the file exists.
LP: #1568940
Diffstat (limited to 'templates/chef_client.rb.tmpl')
| -rw-r--r-- | templates/chef_client.rb.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/chef_client.rb.tmpl b/templates/chef_client.rb.tmpl index c4069d22..cbb6b15f 100644 --- a/templates/chef_client.rb.tmpl +++ b/templates/chef_client.rb.tmpl @@ -26,7 +26,7 @@ log_location "{{log_location}}" {% if validation_name %} validation_client_name "{{validation_name}}" {% endif %} -{% if validation_key %} +{% if validation_cert %} validation_key "{{validation_key}}" {% endif %} {% if client_key %} |