Merge lp:~smoser/cloud-init/trunk.1568940 into lp:~cloud-init-dev/cloud-init/trunk
Proposed by
Scott Moser
Status: | Merged |
---|---|
Merged at revision: | 1207 |
Proposed branch: | lp:~smoser/cloud-init/trunk.1568940 |
Merge into: | lp:~cloud-init-dev/cloud-init/trunk |
Diff against target: |
174 lines (+84/-13) 4 files modified
cloudinit/config/cc_chef.py (+17/-9) doc/examples/cloud-config-chef.txt (+3/-1) templates/chef_client.rb.tmpl (+1/-1) tests/unittests/test_handler/test_handler_chef.py (+63/-2) |
To merge this branch: | bzr merge lp:~smoser/cloud-init/trunk.1568940 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
cloud-init Commiters | Pending | ||
Review via email: mp+291635@code.launchpad.net |
Commit message
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.
To post a comment you must log in.