- Executed 'bzr merge' and resolved all the conflicts.

- Now my branch is identical to trunk.dist

6 files changed, 73 insertions, 6 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']
diff --git a/doc/examples/cloud-config-lxd.txt b/doc/examples/cloud-config-lxd.txt
new file mode 100644
index 00000000..b9bb4aa5
--- /dev/null
+++ b/doc/examples/cloud-config-lxd.txt
@@ -0,0 +1,28 @@
+#cloud-config
+
+# configure lxd
+# default: none
+# all options default to none if not specified
+# lxd: config sections for lxd
+#   init: dict of options for lxd init, see 'man lxd'
+#     network_address: address for lxd to listen on
+#     network_port: port for lxd to listen on
+#     storage_backend: either 'zfs' or 'dir'
+#     storage_create_device: device based storage using specified device
+#     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
+
+lxd:
+  init:
+    network_address: 0.0.0.0
+    network_port: 8443
+    storage_backend: zfs
+    storage_pool: datapool
+    storage_create_loop: 10
+
+
+# The simplist working configuration is
+# lxd:
+#  init:
+#   storage_backend: dir
diff --git a/doc/examples/cloud-config-mount-points.txt b/doc/examples/cloud-config-mount-points.txt
index 3b45b47f..aa676c24 100644
--- a/doc/examples/cloud-config-mount-points.txt
+++ b/doc/examples/cloud-config-mount-points.txt
@@ -42,5 +42,5 @@ mount_default_fields: [ None, None, "auto", "defaults,nobootwait", "0", "2" ]
 # default is to not create any swap files, because 'size' is set to 0
 swap:
    filename: /swap.img
-   size: "auto" or size in bytes
+   size: "auto" # or size in bytes
    maxsize: size in bytes
diff --git a/doc/examples/cloud-config-rsyslog.txt b/doc/examples/cloud-config-rsyslog.txt
index d54960e8..28ea1f16 100644
--- a/doc/examples/cloud-config-rsyslog.txt
+++ b/doc/examples/cloud-config-rsyslog.txt
@@ -17,7 +17,7 @@ rsyslog:
    - content: "*.*   @@192.0.2.1:10514"
      filename: 01-example.conf
    - content: |
-     *.*   @@syslogd.example.com
+      *.*   @@syslogd.example.com
  config_dir: /etc/rsyslog.d
  config_filename: 20-cloud-config.conf
  service_reload_command: [your, syslog, reload, command]
@@ -32,7 +32,7 @@ rsyslog:
 #  - content: "*.*   @@192.0.2.1:10514"
 #    filename: 01-example.conf
 #  - content: |
-#    *.*   @@syslogd.example.com
+#     *.*   @@syslogd.example.com
 # rsyslog_filename: 20-cloud-config.conf
 # rsyslog_dir: /etc/rsyslog.d
 
diff --git a/doc/examples/cloud-config-seed-random.txt b/doc/examples/cloud-config-seed-random.txt
new file mode 100644
index 00000000..08f69a9f
--- /dev/null
+++ b/doc/examples/cloud-config-seed-random.txt
@@ -0,0 +1,32 @@
+#cloud-config
+#
+# random_seed is a dictionary.
+#
+# The config module will write seed data from the datasource
+# to 'file' described below.
+#
+# Entries in this dictionary are:
+#   file:     the file to write random data to (default is /dev/urandom)
+#   data:     this data will be written to 'file' before data from
+#             the datasource
+#   encoding: this will be used to decode 'data' provided.
+#             allowed values are 'encoding', 'raw', 'base64', 'b64'
+#             'gzip', or 'gz'.  Default is 'raw'
+#
+#   command:  execute this command to seed random.
+#             the command will have RANDOM_SEED_FILE in its environment
+#             set to the value of 'file' above.
+#   command_required: default False
+#             if true, and 'command' is not available to be run
+#             then exception is raised and cloud-init will record failure.
+#             Otherwise, only debug error is mentioned.
+#
+# Note: command could be ['pollinate',
+#                         '--server=http://local.pollinate.server']
+# which would have pollinate populate /dev/urandom from provided server
+seed_random:
+  file: '/dev/urandom'
+  data: 'my random string'
+  encoding: 'raw'
+  command: ['sh', '-c', 'dd if=/dev/urandom of=$RANDOM_SEED_FILE']
+  command_required: True
diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt
index 31491faf..0e8ed243 100644
--- a/doc/examples/cloud-config-user-groups.txt
+++ b/doc/examples/cloud-config-user-groups.txt
@@ -15,14 +15,14 @@ users:
     selinux-user: staff_u
     expiredate: 2012-09-01
     ssh-import-id: foobar
-    lock-passwd: false
+    lock_passwd: false
     passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
   - name: barfoo
     gecos: Bar B. Foo
     sudo: ALL=(ALL) NOPASSWD:ALL
     groups: users, admin
     ssh-import-id: None
-    lock-passwd: true
+    lock_passwd: true
     ssh-authorized-keys:
       - <ssh pub key 1>
       - <ssh pub key 2>
@@ -42,7 +42,7 @@ users:
 #   selinux-user:  Optional. The SELinux user for the user's login, such as
 #           "staff_u". When this is omitted the system will select the default
 #           SELinux user.
-#   lock-passwd: Defaults to true. Lock the password to disable password login
+#   lock_passwd: Defaults to true. Lock the password to disable password login
 #   inactive: Create the user as inactive
 #   passwd: The hash -- not the password itself -- of the password you want
 #           to use for this user. You can generate a safe hash via: