Reorg variables so that related items are grouped together, and updat…

…e readme

README.md

@@ -48,12 +48,10 @@ These are the defaults, which can be set to present to prevent a reboot if the l
 The following role variables are defined:
 
 ```
+---
 # lxc-docker is the default
 docker_pkg_name: lxc-docker
 # docker_pkg_name: docker.io
-# Change these to 'present' if you're running Ubuntu 12.04-13.10 and are fine with less-than-latest packages
-kernel_pkg_state: latest
-cgroup_lite_pkg_state: latest
 # Important if running Ubuntu 12.04-13.10 and ssh on a non-standard port
 ssh_port: 22
 # Place to get apt repository key
@@ -62,28 +60,34 @@ apt_key_url: https://get.docker.io/gpg
 apt_key_sig: A88D21E9
 # Name of the apt repository for docker
 apt_repository: deb https://get.docker.io/ubuntu docker main
-
 # The following help expose a docker port or to add additional options when
 # running docker daemon. The default is to not use any special options.
 #docker_opts: >
 # -H unix:https://
 # -H tcp:https://0.0.0.0:2375
 # --log-level=debug
 docker_opts: ""
-# Install Xorg packages for backported kernels. This is usually unnecessary except for environments
-# where an X/Unit desktop is actively being used. If you're not using an X/Unity on 12.04, you
-# won't need to enable this.
-install_xorg_pkgs: false
-# Force an install of the kernel extras, in case you're suffering from some issue related to the
-# static binary provided by upstream Docker. For example, see this GitHub Issue in Docker:
-# https://github.com/docker/docker/issues/12750
-install_kernel_extras: false
 # Versions for the python packages that are installed installed
 pip_version_pip: latest
 pip_version_setuptools: latest
 pip_version_docker_py: latest
-# If this variable is set to true kernel updates and host restarts are permitted. Use with caution in production environments.
+
+# If this variable is set to true kernel updates and host restarts are permitted.
+# Warning: Use with caution in production environments.
 kernel_update_and_reboot_permitted: no
+# Change these to 'present' if you're running Ubuntu 12.04-13.10 and are fine with less-than-latest packages
+kernel_pkg_state: latest
+cgroup_lite_pkg_state: latest
+# Force an install of the kernel extras, in case you're suffering from some issue related to the
+# static binary provided by upstream Docker. For example, see this GitHub Issue in Docker:
+# https://github.com/docker/docker/issues/12750
+# Warning: Installing kernel extras is potentially interruptive/destructive and will install backported
+# kernel if running 12.04.
+install_kernel_extras: false
+# Install Xorg packages for backported kernels. This is usually unnecessary except for environments
+# where an X/Unit desktop is actively being used. If you're not using an X/Unity on 12.04, you
+# won't need to enable this.
+install_xorg_pkgs: false
 
 ```
 

defaults/main.yml

@@ -2,9 +2,6 @@
 # lxc-docker is the default
 docker_pkg_name: lxc-docker
 # docker_pkg_name: docker.io
-# Change these to 'present' if you're running Ubuntu 12.04-13.10 and are fine with less-than-latest packages
-kernel_pkg_state: latest
-cgroup_lite_pkg_state: latest
 # Important if running Ubuntu 12.04-13.10 and ssh on a non-standard port
 ssh_port: 22
 # Place to get apt repository key
@@ -20,17 +17,24 @@ apt_repository: deb https://get.docker.io/ubuntu docker main
 # -H tcp:https://0.0.0.0:2375
 # --log-level=debug
 docker_opts: ""
-# Install Xorg packages for backported kernels. This is usually unnecessary except for environments
-# where an X/Unit desktop is actively being used. If you're not using an X/Unity on 12.04, you
-# won't need to enable this.
-install_xorg_pkgs: false
-# Force an install of the kernel extras, in case you're suffering from some issue related to the
-# static binary provided by upstream Docker. For example, see this GitHub Issue in Docker:
-# https://github.com/docker/docker/issues/12750
-install_kernel_extras: false
 # Versions for the python packages that are installed installed
 pip_version_pip: latest
 pip_version_setuptools: latest
 pip_version_docker_py: latest
-# If this variable is set to true kernel updates and host restarts are permitted. Use with caution in production environments.
+
+# If this variable is set to true kernel updates and host restarts are permitted.
+# Warning: Use with caution in production environments.
 kernel_update_and_reboot_permitted: no
+# Change these to 'present' if you're running Ubuntu 12.04-13.10 and are fine with less-than-latest packages
+kernel_pkg_state: latest
+cgroup_lite_pkg_state: latest
+# Force an install of the kernel extras, in case you're suffering from some issue related to the
+# static binary provided by upstream Docker. For example, see this GitHub Issue in Docker:
+# https://github.com/docker/docker/issues/12750
+# Warning: Installing kernel extras is potentially interruptive/destructive and will install backported
+# kernel if running 12.04.
+install_kernel_extras: false
+# Install Xorg packages for backported kernels. This is usually unnecessary except for environments
+# where an X/Unit desktop is actively being used. If you're not using an X/Unity on 12.04, you
+# won't need to enable this.
+install_xorg_pkgs: false