diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-04-13 12:24:46 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-04-13 12:24:46 -0400 |
| commit | ac50733f77fef296e4af46aa55311a295e964136 (patch) | |
| tree | e247180845a4aa77bd55faa81490d7539f26acc1 /templates | |
| parent | 96cc3852d8126af2dba7cd778473c23bcd883ceb (diff) | |
| parent | 2b3f56294576998246e13f9b07074bad7b4bf212 (diff) | |
| download | vyos-cloud-init-ac50733f77fef296e4af46aa55311a295e964136.tar.gz vyos-cloud-init-ac50733f77fef296e4af46aa55311a295e964136.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')
| -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 %} |