diff --git a/manifests/client.pp b/manifests/client.pp
index 07d434ec..1b6ad822 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -1,3 +1,12 @@
+# == Class: cinder::client
+#
+# Installs Cinder python client.
+#
+# === Parameters
+#
+# [*ensure*]
+#   Ensure state for package. Defaults to 'present'.
+#
 class cinder::client(
   $package_ensure = 'present'
 ) {
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 7d8faf9e..46864b59 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -1,3 +1,45 @@
+# == Class: cinder::keystone::auth
+#
+# Configures Cinder user, service and endpoint in Keystone.
+#
+# === Parameters
+#
+# [*password*]
+#   Password for Cinder user. Required.
+#
+# [*email*]
+#   Email for Cinder user. Optional. Defaults to 'cinder@localhost'.
+#
+# [*auth_name*]
+#   Username for Cinder service. Optional. Defaults to 'cinder'.
+#
+# [*configure_endpoint*]
+#   Should Cinder endpoint be configured? Optional. Defaults to 'true'.
+#
+# [*service_type*]
+#    Type of service. Optional. Defaults to 'volume'.
+#
+# [*public_address*]
+#    Public address for endpoint. Optional. Defaults to '127.0.0.1'.
+#
+# [*admin_address*]
+#    Admin address for endpoint. Optional. Defaults to '127.0.0.1'.
+#
+# [*internal_address*]
+#    Internal address for endpoint. Optional. Defaults to '127.0.0.1'.
+#
+# [*port*]
+#    Port for endpoint. Optional. Defaults to '8776'.
+#
+# [*region*]
+#    Region for endpoint. Optional. Defaults to 'RegionOne'.
+#
+# [*tenant*]
+#    Tenant for Cinder user. Optional. Defaults to 'services'.
+#
+# [*protocol*]
+#    Protocol for public endpoint. Optional. Defaults to 'http'.
+#
 class cinder::keystone::auth (
   $password,
   $auth_name          = 'cinder',
diff --git a/manifests/setup_test_volume.pp b/manifests/setup_test_volume.pp
index 8b73f0e5..f8a2452d 100644
--- a/manifests/setup_test_volume.pp
+++ b/manifests/setup_test_volume.pp
@@ -1,3 +1,18 @@
+# == Class: cinder::setup_test_volume
+#
+# Setup a volume group on a loop device for test purposes.
+#
+# === Parameters
+#
+# [*volume_name*]
+#   Volume group name. Defaults to 'cinder-volumes'.
+#
+# [*size*]
+#   Volume group size. Defaults to '4G'.
+#
+# [*loopback_device*]
+#   Loop device name. Defaults to '/dev/loop2'.
+#
 class cinder::setup_test_volume(
   $volume_name     = 'cinder-volumes',
   $size            = '4G',