diff options
| author | Flavio Castelli <fcastelli@suse.com> | 2017-03-19 16:17:42 +0100 |
|---|---|---|
| committer | Alvaro <alvaro.saurin@gmail.com> | 2017-03-29 18:15:54 +0200 |
| commit | 5abb223d4b6a065c1ce10db40544b452383e5ab2 (patch) | |
| tree | d79b7a7493587e7a65a509eff7b622dbeaed7157 /docs/providers | |
| parent | 6b32459619de2b8aa837f9853f87448bd528e787 (diff) | |
| download | terraform-provider-libvirt-5abb223d4b6a065c1ce10db40544b452383e5ab2.tar terraform-provider-libvirt-5abb223d4b6a065c1ce10db40544b452383e5ab2.tar.gz | |
cloud-init: rework user-data handling
Merge the user data specified by explicit terraform directives into
the raw data provided by the user. The raw data has priority over the
values specified using older directives.
Signed-off-by: Flavio Castelli <fcastelli@suse.com>
Diffstat (limited to 'docs/providers')
| -rw-r--r-- | docs/providers/libvirt/r/cloudinit.html.markdown | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/providers/libvirt/r/cloudinit.html.markdown b/docs/providers/libvirt/r/cloudinit.html.markdown index a2bddfab..e30cf55a 100644 --- a/docs/providers/libvirt/r/cloudinit.html.markdown +++ b/docs/providers/libvirt/r/cloudinit.html.markdown @@ -33,8 +33,8 @@ The following arguments are supported: * `ssh_authorized_key` - (Optional) A public ssh key that will be accepted by the `root` user. * `user_data` - (Optional) Raw cloud-init user data. This content will -be merged automatically with the values specified in other arguments -(like `local_hostname`, `ssh_authorized_key`, etc), but they cannot be -specified in both places at the same time. + be merged automatically with the values specified in other arguments + (like `local_hostname`, `ssh_authorized_key`, etc). The contents of + `user_data` will take precedence over the ones defined by the other keys. Any change of the above fields will cause a new resource to be created. |