diff options
| author | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-02-04 19:20:17 -0600 |
|---|---|---|
| committer | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-02-04 19:20:17 -0600 |
| commit | 2f2bd4232b3f51f571f76c30b715c215e5815703 (patch) | |
| tree | 086f68ab8efe1b6fac204be34fa26efe2ad60f9f /doc | |
| parent | 1f24e50c655ccc0c49afcd3225ce8f0e0bce05b9 (diff) | |
| parent | 6b294286e0d0a1da6b24b338cae3b900a763e9d2 (diff) | |
| download | vyos-cloud-init-2f2bd4232b3f51f571f76c30b715c215e5815703.tar.gz vyos-cloud-init-2f2bd4232b3f51f571f76c30b715c215e5815703.zip | |
Merge from trunk and resolve text conflict in ChangeLog
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/cloud-config-datasources.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/examples/cloud-config-datasources.txt b/doc/examples/cloud-config-datasources.txt index 3bde4aac..2651c027 100644 --- a/doc/examples/cloud-config-datasources.txt +++ b/doc/examples/cloud-config-datasources.txt @@ -51,12 +51,19 @@ datasource: policy: on # [can be 'on', 'off' or 'force'] SmartOS: + # For KVM guests: # Smart OS datasource works over a serial console interacting with # a server on the other end. By default, the second serial console is the # device. SmartOS also uses a serial timeout of 60 seconds. serial_device: /dev/ttyS1 serial_timeout: 60 + # For LX-Brand Zones guests: + # Smart OS datasource works over a socket interacting with + # the host on the other end. By default, the socket file is in + # the native .zoncontrol directory. + metadata_sockfile: /native/.zonecontrol/metadata.sock + # a list of keys that will not be base64 decoded even if base64_all no_base64_decode: ['root_authorized_keys', 'motd_sys_info', 'iptables_disable'] |