diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp
index 8f5261577..9510c4db3 100644
--- a/manifests/agents/metadata.pp
+++ b/manifests/agents/metadata.pp
@@ -1,15 +1,55 @@
+# == Class: neutron::agents::metadata
+#
+# Setup and configure Neutron metadata agent.
+#
+# === Parameters
+#
+# [*auth_password*]
+#   (required) The password for the administrative user.
+#
+# [*shared_secret*]
+#   (required) Shared secret to validate proxies Neutron metadata requests.
+#
+# [*package_ensure*]
+#   Ensure state of the package. Defaults to 'present'.
+#
+# [*enabled*]
+#   State of the service. Defaults to true.
+#
+# [*debug*]
+#   Debug. Defaults to false.
+#
+# [*auth_tenant*]
+#   The administrative user's tenant name. Defaults to 'services'.
+#
+# [*auth_user*]
+#   The administrative user name for OpenStack Networking.
+#   Defaults to 'neutron'.
+#
+# [*auth_url*]
+#   The URL used to validate tokens. Defaults to 'http://localhost:35357/v2.0'.
+#
+# [*auth_region*]
+#   The authentication region. Defaults to 'RegionOne'.
+#
+# [*metadata_ip*]
+#   The IP address of the metadata service. Defaults to '127.0.0.1'.
+#
+# [*metadata_port*]
+#   The TCP port of the metadata service. Defaults to 8775.
+#
 class neutron::agents::metadata (
   $auth_password,
   $shared_secret,
-  $package_ensure               = 'present',
-  $enabled                      = true,
-  $debug                        = false,
-  $auth_tenant                  = 'services',
-  $auth_user                    = 'neutron',
-  $auth_url                     = 'http://localhost:35357/v2.0',
-  $auth_region                  = 'RegionOne',
-  $metadata_ip                  = '127.0.0.1',
-  $metadata_port                = '8775'
+  $package_ensure = 'present',
+  $enabled        = true,
+  $debug          = false,
+  $auth_tenant    = 'services',
+  $auth_user      = 'neutron',
+  $auth_url       = 'http://localhost:35357/v2.0',
+  $auth_region    = 'RegionOne',
+  $metadata_ip    = '127.0.0.1',
+  $metadata_port  = '8775'
   ) {
 
   include neutron::params
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 23d967340..710dc3ff5 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -1,3 +1,48 @@
+# == Class: neutron::keystone::auth
+#
+# Configures Neutron user, service and endpoint in Keystone.
+#
+# === Parameters
+#
+# [*password*]
+#   (required) Password for Neutron user.
+#
+# [*auth_name*]
+#   Username for Neutron service. Defaults to 'neutron'.
+#
+# [*email*]
+#   Email for Neutron user. Defaults to 'neutron@localhost'.
+#
+# [*tenant*]
+#   Tenant for Neutron user. Defaults to 'services'.
+#
+# [*configure_endpoint*]
+#   Should Neutron endpoint be configured? Defaults to 'true'.
+#
+# [*service_type*]
+#   Type of service. Defaults to 'network'.
+#
+# [*public_protocol*]
+#   Protocol for public endpoint. Defaults to 'http'.
+#
+# [*public_address*]
+#   Public address for endpoint. Defaults to '127.0.0.1'.
+#
+# [*admin_address*]
+#   Admin address for endpoint. Defaults to '127.0.0.1'.
+#
+# [*internal_address*]
+#   Internal address for endpoint. Defaults to '127.0.0.1'.
+#
+# [*port*]
+#   Port for endpoint. Defaults to '9696'.
+#
+# [*public_port*]
+#   Port for public endpoint. Defaults to $port.
+#
+# [*region*]
+#   Region for endpoint. Defaults to 'RegionOne'.
+#
 class neutron::keystone::auth (
   $password,
   $auth_name          = 'neutron',
diff --git a/manifests/params.pp b/manifests/params.pp
index 086ace9aa..3ac50278c 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,3 +1,4 @@
+#
 class neutron::params {
 
   if($::osfamily == 'Redhat') {
diff --git a/manifests/plugins/cisco.pp b/manifests/plugins/cisco.pp
index ff9318d05..f874e6403 100644
--- a/manifests/plugins/cisco.pp
+++ b/manifests/plugins/cisco.pp
@@ -75,7 +75,8 @@ class neutron::plugins::cisco(
   $max_ports         = '100',
   $max_port_profiles = '65568',
   $manager_class     = 'neutron.plugins.cisco.segmentation.l2network_vlan_mgr_v2.L2NetworkVLANMgr',
-  $max_networks      = '65568'
+  $max_networks      = '65568',
+  $package_ensure    = 'present'
 )
 {
   Neutron_plugin_cisco<||> ~> Service['neutron-server']
diff --git a/manifests/plugins/ovs/bridge.pp b/manifests/plugins/ovs/bridge.pp
index 37f8ea5f7..6de6ff683 100644
--- a/manifests/plugins/ovs/bridge.pp
+++ b/manifests/plugins/ovs/bridge.pp
@@ -1,3 +1,4 @@
+#
 define neutron::plugins::ovs::bridge {
   $mapping = split($name, ':')
   $bridge = $mapping[1]
diff --git a/manifests/plugins/ovs/port.pp b/manifests/plugins/ovs/port.pp
index 12b63c6f8..96b1c5cc8 100644
--- a/manifests/plugins/ovs/port.pp
+++ b/manifests/plugins/ovs/port.pp
@@ -1,3 +1,4 @@
+#
 define neutron::plugins::ovs::port {
   $mapping = split($name, ':')
   vs_port {$mapping[1]: