diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
| commit | 7b925df28f84c824e9e4697723d879903a81e780 (patch) | |
| tree | 2314e210f13cc5cc7bdc59971b9f4b657f755825 /doc | |
| parent | d0c794919d9a9bf176eb96e25e72836a65e841f1 (diff) | |
| parent | a551cb080388c2016bcf23981f99a4a6aa0fe198 (diff) | |
| download | vyos-cloud-init-7b925df28f84c824e9e4697723d879903a81e780.tar.gz vyos-cloud-init-7b925df28f84c824e9e4697723d879903a81e780.zip | |
merge trunk at 0.7.7~bzr1208
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/cloud-config-chef.txt | 4 | ||||
| -rw-r--r-- | doc/examples/cloud-config-lxd.txt | 27 |
2 files changed, 30 insertions, 1 deletions
diff --git a/doc/examples/cloud-config-chef.txt b/doc/examples/cloud-config-chef.txt index 4edad653..b886cba2 100644 --- a/doc/examples/cloud-config-chef.txt +++ b/doc/examples/cloud-config-chef.txt @@ -67,7 +67,9 @@ chef: # Default validation name is chef-validator validation_name: "yourorg-validator" - validation_key: | + # if validation_cert's value is "system" then it is expected + # that the file already exists on the system. + validation_cert: | -----BEGIN RSA PRIVATE KEY----- YOUR-ORGS-VALIDATION-KEY-HERE -----END RSA PRIVATE KEY----- diff --git a/doc/examples/cloud-config-lxd.txt b/doc/examples/cloud-config-lxd.txt index b9bb4aa5..e96f314b 100644 --- a/doc/examples/cloud-config-lxd.txt +++ b/doc/examples/cloud-config-lxd.txt @@ -12,6 +12,20 @@ # storage_create_loop: set up loop based storage with size in GB # storage_pool: name of storage pool to use or create # trust_password: password required to add new clients +# bridge: dict of options for the lxd bridge +# mode: one of "new", "existing" or "none". Defaults to "new" +# name: the name of the bridge. Defaults to "lxdbr0" +# ipv4_address: an IPv4 address (e.g. 10.0.8.1) +# ipv4_netmask: a CIDR mask value (e.g. 24) +# ipv4_dhcp_first: the first IP of the DHCP range (e.g. 10.0.8.2) +# ipv4_dhcp_last: the last IP of the DHCP range (e.g. 10.0.8.254) +# ipv4_dhcp_leases: the size of the DHCP pool (e.g. 250) +# ipv4_nat: either "true" or "false" +# ipv6_address: an IPv6 address (e.g. fd98:9e0:3744::1) +# ipv6_netmask: a CIDR mask value (e.g. 64) +# ipv6_nat: either "true" or "false" +# domain: domain name to use for the bridge + lxd: init: @@ -20,6 +34,19 @@ lxd: storage_backend: zfs storage_pool: datapool storage_create_loop: 10 + bridge: + mode: new + name: lxdbr0 + ipv4_address: 10.0.8.1 + ipv4_netmask: 24 + ipv4_dhcp_first: 10.0.8.2 + ipv4_dhcp_last: 10.0.8.3 + ipv4_dhcp_leases: 250 + ipv4_nat: true + ipv6_address: fd98:9e0:3744::1 + ipv6_netmask: 64 + ipv6_nat: true + domain: lxd # The simplist working configuration is |